yup
Merge branch 'master' of https://github.com/msvb93/Creepy_Christmas

Conflicts:
	CreepyChristmas/Boss1.class
	CreepyChristmas/Game.class
	CreepyChristmas/Game.java
	CreepyChristmas/Health.class
	CreepyChristmas/Object.class
	CreepyChristmas/package.bluej