PyxelEdit map importer, collisionmap helper
Merge branch 'master' of github.com:Dvergar/BaconJam

Conflicts:
	src/Main.hx