Poliwrath and oddish
Merge pull request #1182 from LightAdept/master

Poliwrath and oddish