working on turn based combat
Merge branch 'master' of https://github.com/cavasquez/DD