Numerous changes to ./oo/Player.java
Merge branch 'master' of https://github.com/augustjd/PiedPipers2014