Combined phase three with the rest of the game (Attempt #1)
Merge branch 'master' of https://github.com/IannothSlurgh/Game-Repository