working version, use this one
Merge branch 'master' of github.com:jgdevelopment/HauntedMansion

Conflicts:
	Game.class
	Game.ctxt
	Game.java
	User.class
	User.java
	bluej.pkg
	package.bluej