zxc
Merge https://github.com/PanFriedOctopus/game

Conflicts:
	idk/bin/flash/bin/idk.swf
Merge branch 'master' of https://github.com/PanFriedOctopus/game

Conflicts:
	idk/bin/flash/bin/idk.swf
	idk/bin/flash/haxe/DefaultAssetLibrary.hx
	idk/src/Game.hx