minor changes made
fixed merge confilct in ClueGame.java