Merge branch 'master' into mauricio
Revert 6c455af..661dbf5

This rolls back to commit 6c455af1bbf26b3737309ece6fe3349b33fb178e.
Changed Board.java
Pretty pictures
Merge branch 'master' into mauricio
implemented checkForNumberOfVillages in board.java
Partial implementation of FindCityRanks in the board.java file
Merge branch 'mauricio'

Conflicts:
	src/controllers/GameManager.java
TODO

Added todo
Merge branch 'master' into mauricio
Merge remote-tracking branch 'origin/master'
Null exceptions

Check for nulls
Merge branch 'master' into mauricio
Modified the serialze() in Developer to not hold reference to Player since I will make a method that loads the player after the objects are created
Commented out the deleteGame JMenuItem in GameFrame since I deleted the deleteGame() method in GameManager
Fixed start game logic, handles non-numeric inputs
Merge pull request #8 from nwcaldwell/brett

Fixed start game logic
Update GameFrame.java
Bye Gitignore
made alt key commands