added final changes
Merge branch 'master' of https://github.com/flymperopoulos/ShooterPlatform

Conflicts:
	Game.py