Fixed another conflict
Merge branch 'master' of github.com:TheElephantSeal/open-source-game