Pokemon method names now all unique
Merge remote-tracking branch 'origin/master'