AEEAE
Merge branch 'readme-edit'

Conflicts:
	README.md