Merge branch 'master' into mauricio
bug fix: [ vs {. Added pair on Board, Cell Tile. Started loading.

Array had { instead of [.
Json.serializeArray was called without naming the array, so wrapped in
a json pair.
Started on the loading helpers.
Merge branch 'master' into mauricio

Conflicts:
	src/models/Tile.java
Merge branch 'master' into mauricio
Merge branch 'mauricio'
Merge branch 'master' of https://github.com/nwcaldwell/chokinghazard
Attempt at implementing serialize() in Developer.java
Implemented serialize() in Game.java
Change the order of attributes in Game.java to match the order of serialize() in Game.java
Implemented serialize() in Player.java and commented with some questions
github is confusing
poop
Worked on loading, Space, Cell.

Added a few helper methods to Json.
Changed Spaces for subclasses to hold type instead of just returning
correctly. For serializing. (Didn’t change interface)
Uncommented developerPlayer from Cell, serialized it.
Merge branch 'master' into mauricio
Changes to Board and Cell constructors
merging the changes of game and game manager
merging the changes of game and game manager
dumb commit for an alert
Merge pull request #2 from nwcaldwell/brett

dumb commit for an alert stopping peasants from upgrading palaces
Added code to find all connected cells to a given cell