Alex's changes to readme.md
Merge branch 'master' into alex_work

Conflicts:
	readme.md
Merge branch 'alex_work'