Made the things work
Merge branch 'master' of https://github.com/robertquitt/APCS.git
The game is working to some extent