more stuff
more stuff!!!
Merge branch 'sever' of http://github.com/DanCardin/pyPlatform

Conflicts:
	game.py
	server.py
moorererere
Merge branch 'sever' of https://github.com/DanCardin/pyPlatform

Conflicts:
	game.py
more server fixes