changed in readme file
Merge branch 'master' into readme-edits

Conflicts:
	README.md