Finish branch readme
Merge branch 'readme-edits'

Conflicts:
	README.md