fixed errors due to merge
Merge branch 'master' of https://github.com/njchristian/Multiplayer-Game