hey
Merge branch 'mauricio'
Merge branch 'master' into brett
Added getDevsOnBoard() method in Player to use in Game's loadObject(...) for loading the game and setting all the currentCell attributes in the developers
Merge remote-tracking branch 'origin/master'
Added attributes to Developer to aid in the loading of a game. Also updated loadObject(...) in Developer to account for the addition of attributes
Added get methods for the attributes added
push findNumberVillagesConnected algorithm
Developer's currentCell is set after the game is loaded
Merge pull request #9 from nwcaldwell/brett

findNumberVillagesConnected algorithm and more
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