Working on stack being destroyed
Fix for combat
Merge pull request #149 from devinlynch/devin-final

Combat fix