Fixing battle system
Merge pull request #142 from Ancanus/Battle

Fixing battle system