Update README.md
Update README.md
Update README.md
Update README.md
Update server.js
Merge branch 'refs/heads/master' into expressize

Conflicts:
	server.js