Added in Chikorita
Merge branch 'master' of https://github.com/MrMasochism/Pixelmon
Merge branch 'master' of https://github.com/MrMasochism/Pixelmon
Merge pull request #1292 from Xwaffle1/master

Added in Chikorita