clean up
Merge branch 'master' of https://github.com/johnny-chien/GGJ13
merged project file
pray pray pray
Merge branch 'master' of https://github.com/johnny-chien/GGJ13

Conflicts:
	GGJ13.project.gmx
	background/images/menuBackground.png
	objects/b1.object.gmx
	objects/b2.object.gmx
	objects/b3.object.gmx
	objects/b4.object.gmx
	objects/b5.object.gmx
	objects/b6.object.gmx
	objects/b7.object.gmx
	objects/b8.object.gmx
	objects/b9.object.gmx
	objects/obj_regMan.object.gmx
	rooms/room1.room.gmx
	rooms/room2.room.gmx
	rooms/room4.room.gmx
	sound/audio/bgm.ogg
	sound/audio/explosionSound.ogg
	sound/bgm.sound.gmx
	sound/explosionSound.sound.gmx