Fixes #11
Merge branch 'master' into fov

Conflicts:
	Game.py