mac25

also sandz i accidentally named an image incorrectly so that was fixed ty
Merge pull request #395 from smogon/1f3e1a3284245a0f7de6a266fb50ec70

mac25