It seems my beard can entertain. Just pulling
Merge branch 'master' of https://github.com/PanFriedOctopus/game

Conflicts:
	idk/bin/flash/bin/idk.swf