changes in different files
Merge branch 'master' into readme-edits

Conflicts:
	README.md
Merge branch 'readme-edits'