Updates README
Update README.md
Merge branch 'master' into more

Conflicts:
	README.md