Implemented loadGame() and modified getFileName(...) and saveGame()
Merge remote-tracking branch 'origin'
Merge branch 'master' into mauricio
Revert 6c455af..661dbf5

This rolls back to commit 6c455af1bbf26b3737309ece6fe3349b33fb178e.
Pretty Pictures
Pretty pictures
Merge branch 'master' into mauricio
implemented checkForNumberOfVillages in board.java
Updated functionality of menu options, save/load/quit/delete in GameManager
Fixed bug with deleteGame Menu option in GameFrame.java
Added setGamePanel(...) method to Game.java so that the gamePanel can be cleared when a user calls the deleteGame() method in GameManager which deletes the current game
Deleted setGamePanel method in Game.java since it didn't help with my problem. Also re-updating GameManager.java
Merge branch 'master' into meghan
Partial implementation of FindCityRanks in the board.java file
Updated dialog boxes in quitGame() and deleteGame() in GameManager
Got rid of deleteGame() in GameManager since it is unnecessary functionality
Merge branch 'mauricio'

Conflicts:
	src/controllers/GameManager.java
TODO

Added todo
Merge branch 'master' into mauricio
Removed getFileName() method and just put into saveGame() in GameManager.