hey
Merge branch 'master' into brett
push findNumberVillagesConnected algorithm
Merge pull request #9 from nwcaldwell/brett

findNumberVillagesConnected algorithm and more
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
Aded null check to method in loadGame(...)
Fixed to get the correct method name RGB()....kdjfnaksjfd
more work on checking palace upgrades
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