Merged.
Merge branch 'master' of gh:game-jamburg/nap-time

Conflicts:
	src/game/player.lua