Merge branch 'master' into mauricio
Saving changes
Merge branch 'master' into mauricio
Still have NullPointer if press enter a second time after already placing tile but I fixed other errors.
Changed RBG to RBG which is the correct method name in Plauer's loadObject
Merge remote-tracking branch 'origin/master'
Fixed useActionToken() in Player to set ifActionTokenUsed to true, limiting the player to one Action Token per turn. Also deleted comments in serialize() in Player
Changed checkEdgePlacement and fixed logic error in checkCityRanks
In Board, Fixed bug so that map[][] indicies all have Cell objects. All the ones besides central java were null
Merge branch 'meghan'
In Board, fixed bug where isPlacedLandTile boolean was not being updated correctly. Now players can end their turn (validly) during a non-final turn. Haven't tested wth final turn
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'