This was the version I submitted on the 22nd

Changes to formatting and player.cpp. Passes all tests as far as I can
tell