Serialized playerColor to be the getRGB() instead of toString(). Easier for load and save
Merge branch 'meghan'
Fixed some bugs for loading/saving

Mostly stopping array casting
Merge branch 'master' of https://github.com/nwcaldwell/chokinghazard

Conflicts:
	src/models/Cell.java
	src/models/OneSpaceTile.java
	src/views/GameFrame.java
Deleted Stupid Files

My bad
Merge branch 'master' into mauricio
Aded null check to method in loadGame(...)
Saving changes
Merge branch 'master' into mauricio
Fixed to get the correct method name RGB()....kdjfnaksjfd
Merge pull request #10 from nwcaldwell/brett

more work on checking palace upgrades
With Jose modified Board and Player classes, especially placing tiles.
With Jose modified Board and Player classes, especially placing tiles.
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'