Update 7:00

Update
Merge remote-tracking branch 'origin/master'

Conflicts:
	CreepyChristmas/Boss.class
	CreepyChristmas/Boss.ctxt
	CreepyChristmas/Boss.java
	CreepyChristmas/Boss1.class
	CreepyChristmas/Boss2.class
	CreepyChristmas/Boss3.class
	CreepyChristmas/Boss4.class
	CreepyChristmas/Game.class
	CreepyChristmas/Health.class
	CreepyChristmas/Health.ctxt
	CreepyChristmas/Health.java
	CreepyChristmas/package.bluej