New Abra, small fix to Tirtouga
Merge remote-tracking branch 'origin/master'
Electabuzz and bulbasaur
Merge pull request #1016 from LightAdept/master

New pokes and small fixes