Fixed evolution bug.
Merge branch 'master' of https://github.com/Camtendo/jokemon