Merge pull request #1298 from Xwaffle1/master

Added Rayquaza, new Charmeleon, and fixed Wartortle's legs, new Electrode!
Initial commit
Merge branch 'master' of https://github.com/Pixelmon/PixelmonNew

Conflicts:
	README.md
little tweak to confusion chance calculation