bug fix
Merge branch 'master' of github.com:TheHumanSpaceProgram/TheGame
bug fix