the version displayed at the jam

Fixes and adding music
Merge remote-tracking branch 'origin/master'

Conflicts:
	platform.gmx/objects/obj_player.object.gmx
	platform.gmx/objects/obj_playerBoss.object.gmx
	platform.gmx/platform.project.gmx
	platform.gmx/rooms/bossRoom.room.gmx