pahasi juurde
Merge remote-tracking branch 'origin/kaspar-dev' into Madis

Conflicts:
	game/main.py
Late development