fixed battle so that it works
Merge branch 'master' of https://github.com/Stuyablo3979/StuyabloProj