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

Conflicts:
	bluej.pkg
	package.bluej