changes
Merge remote-tracking branch 'origin/master'

Conflicts:
	CreepyChristmas/Boss1.class
	CreepyChristmas/Boss2.class
	CreepyChristmas/Boss2Room.class
	CreepyChristmas/Boss3.class
	CreepyChristmas/Boss3Room.class
	CreepyChristmas/Boss4.class
	CreepyChristmas/Game.class
	CreepyChristmas/Game.ctxt
	CreepyChristmas/package.bluej