new magneton i forgot
Disabling articuno until i can fix
Merge remote-tracking branch 'origin/master'
Merge pull request #932 from LightAdept/master

Fix to magneton (his new model added) and disabling articuno