major battle bug fixes
Merge pull request #3 from ceojac/master

Battle system bug fixes