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

Conflicts:
	Game.class
	Game.java
	User.class
	User.ctxt
	User.java