fix
Merge branch 'master' of https://github.com/nczempin/Turris-Monacoae

Conflicts:
	game.lua
	main.lua
Merge branch 'master' of https://github.com/nczempin/Turris-Monacoae

Conflicts:
	game.lua