fixed type (name -> this.name
Merge branch 'master' of github.com:GHowlett/Contact-Word-Game
resolved conflicts
moved game loop and master/giver cycling control to server side