Battle Upgrades

Added some content and thought to the dynamics of combat.
Merge branch 'master' of https://github.com/Psiryu/4000War