her
Merge branch 'master' of https://github.com/Machtan/M3

Conflicts:
	PyGame/simplegame/__pycache__/__init__.cpython-33.pyc
	PyGame/simplegame/__pycache__/game.cpython-33.pyc