Update README.md
Update server.py
Merge branch 'master' into optimize-server

Conflicts:
	server/server.py