Fix
Merge branch 'master' of https://github.com/UNC-HackDuke-14/game