starting to add combat.
Merge branch 'master' of https://github.com/JBillingsley/eecs-390-rts.git