no message
Merge branch 'master' of github.com:jgdevelopment/HauntedMansion

Conflicts:
	Game.class
	Game.java