Added a few lines of code
Merge branch 'master' of https://github.com/hackercards/hackercards

Conflicts:
	server.py