Commiting to pull and merge with Mauricio's most recent push
Merge branch 'master' into meghan
Renamed loadObject(...) to loadJsonObject(..) in Developer and Player
Commiting this to update with Mauricio's commits
Resolving merge conflicts with Developer and Game
Fixed the loadObject to fit the change of return type from void to Game
Changed the name I changed incorrectly from loadJsonObject(...) to loadObject(...)
Changed name from loadJsonObject(...) to loadObject(...) and fixed when the Game loads the Players to match the change in return value in loadObject(...) in Player
Implemented loadObject(...) in Player and changed toString() to include the name attribute which was just added
changed how the players were created in loadObject(...) in Game
implemented loadObject(...) in Developer
Deleted comments in loadJsonObject in GameManager and had the currentGame equal the loadedGame
Settled merge conflicts with GameManager.java