Merge remote-tracking branch 'origin/master'
Mareep. Also new Magnemite and Charizard. (Magneton coming soon)
Mareep with Hidden Wool
Merge pull request #678 from LightAdept/master

Confused myself doing this somehow, but here you go!