Craig: fixed the merge conflicts. Had some broken test cases after the merge, so fixed those. Cat is now jumping!
Craig/Dom: Finished the jumping story. Added a mock_game function in the player_spec.