Solved other indentation problems
Merge branch 'master' of https://github.com/sagieske/AA1

Conflicts:
	one/game.py