Changes made to the Player class and PlayerTest again. Also started modifying Game.java
Merge branch 'master' of https://github.com/Stodid/late-term-assignment