make the server a server
Merge branch 'master' of github.com:cbhl/pennapps13s

Conflicts:
	server/app.py