Added:
+Day cycle - 30 seconds
+farm/mine/house/gold buttons
+food, foodPD, water, waterPD, stone, stonePD, gold, goldPD, populations
+counters
+New JPanels in MainGame
+new Dimensions/width/height in Screen.java
+labels - not working
+TileImgs.java - image paths for tiles
+Renamed Tile_Vars and cleaned up

Removed:
-Deleted Farm.java, Gold.java, Mine.java, House.java
Merge branch 'master' of ssh://git@github.com/MrFlyingbananas/Civ_Game_Main.git
Formated ingame menu
Condensed settings to one file
labels still broken ;c