changes

changes
Merge remote-tracking branch 'origin/master'

Conflicts:
	CreepyChristmas/Game.class
	CreepyChristmas/Game.ctxt
	CreepyChristmas/Game.java
	CreepyChristmas/package.bluej