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

Conflicts:
	CommandWords.class
	Game.class
	bluej.pkg
	package.bluej
Merge branch 'master' of https://github.com/jgdevelopment/HauntedMansion
no message
Merge branch 'master' of https://github.com/jgdevelopment/HauntedMansion

Conflicts:
	Game.class
	bluej.pkg
	package.bluej