Fixed crash on closing trading gui with button
Added in Sandslash, Persian, the new mareep, and raticate (even though
he was never approved, my bad).
Merge remote-tracking branch 'origin/master'
Added Ornithologist trainer.
Finished Clefable, Clefairy, and Nidoranfemale (though shes way too big)
Merge pull request #672 from LightAdept/master

Added in Pokemon
Merge pull request #671 from Hiroku/master

Fixed magnitude and added RaiseStats
Added aqua ring, its not healing for some reason!
Removed silly line in battleController