In class working
Merge branch 'master' of https://github.com/msvb93/Creepy_Christmas

Conflicts:
	CreepyChristmas/Game.class
	CreepyChristmas/Game.java