fix damage
Merge pull request #96 from sasarky/feature/pokemon

fix damage
Merge develop into master