mergin'
Merge branch 'master' of https://github.com/rockwotj/CSSE376-Civ
Finished GREAT PEOPLE and did some other cool stuff without Joe