merge
Merge branch 'master' of https://github.com/dmke/GGJ2013

Conflicts:
	src/game.lua
Merge branch 'master' of https://github.com/dmke/GGJ2013