updated code
merged changes
Merge branch 'master' of https://github.com/dgrisham/CluePlayers

merging changes
fixed merge error