Merge branch 'master' into mauricio
Saving changes
Merge branch 'master' into mauricio
Changed checkEdgePlacement and fixed logic error in checkCityRanks
Merge branch 'meghan'
Merge branch 'meghan'
Initialized board bug

Board was being called without initialization. Added some commented
debugging code.
Merge branch 'master' into mauricio

Conflicts:
	src/models/Game.java
	src/models/Player.java
Merge branch 'mauricio'
Changed Player's serialized(no interface change)

Stopped giving “Player” : before the object
Changed casts in Player

Casted object by object instead of array as a whole
Space loads correct subtype

In Cell, when loading a new space, it checks for which type it is and
then creates that type.
Serialize saves connected cells

Saves them as an array of objects holding the cells x and y
Connected cells (Load/Save)

Loading and saving connected cells by passing them in with the
JsonObject as part of the map. Accessed by getting the value for key
“list”
Fixed null pointer when pressing enter
Updating SpaceVillage
Less hardcoding, null checking

Check for null in connected cells, gets size of outsideInnerCells
instead of hardcoding 44.
Loading more robust

Checks if the json is initialized with “Game” or not and treats it
either way.
Modified moveDelveloperOntoBoard
Merge branch 'vicente'