Apparantly there was a conflict that is now resolved
Merge branch 'master' of https://github.com/TheHumanSpaceProgram/TheGame