Dumb issues I caused fixed
Merge branch 'master' of https://github.com/CM1101Group8/game