Change to readme
Merge branch 'alex_branch'

Conflicts:
	README.md