May have done some unnecessary things to get these to the master branch,
but hopefully it worked out.

Anyway, some stuff in the Person and Player classes is commented out,
but will be un-commented once I look over the other object classes and
know what methods to call etc...
Merge branch 'master' into Geoffs_WIP