initial commit, round two coming soon
Fixed conditional logic for setting up the game
Merge pull request #7 from nwcaldwell/brett

Brett
Added Developer things
Modified Developer.java with some old code since serialize() was deleted.
made changes to game and GUI
made changes to game and GUI, merging
Updated Player.java since serialize() was deleted somehow
Merge branch 'meghan'
merged with the branch