Merge branch 'develop' of github.com:UCF-SoftwareEngineering-Team2/GameServe into develop