updated readme
Merge branch 'master' into prod

Conflicts:
	README.md