Update README.md
Merge branch 'master' into express

Conflicts:
	README.md