conflict change
Merge branch 'readme-changes'

Conflicts:
	README.md