server changes
Merge branch 'master' of https://github.com/PixelatedGame/pixelated

Conflicts:
	client/game.py
ala kefak
lolz