Stash.
Merge branch 'master' of github.com:dohnto/grans-lettol

Conflicts:
	src/game.cpp