changes to clueGame
resolved merge conflicts