Cleaned up merge conflicts and WIP snippits
Merge branch 'master' of https://www.github.com/reytiger/ClueGame

Conflicts:
	Clue/src/game/ClueGame.java
	Clue/src/gui/HandPanel.java