put restrictions on building stuff and started attacking cities
merging
Merge branch 'master' of https://github.com/Civilization-CSSE376/Civilization
merging