Fixed merge issue in GameServer
Merge branch 'master' of https://github.com/brodypainter/FinalProject