combat done except for victory benefits
Finished all of combat except for the aftermath
Merge branch 'master' of https://github.com/rockwotj/CSSE376-Civ
Finished all of combat except for the aftermath