Server and others
Merge branch 'master' of https://github.com/Kreusser/pythonframe

Conflicts:
	README.md