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

Fix for combat