Gen 6 data
Merge pull request #482 from WriggleNightbug/patch-1

Gen 6 data
Merge branch 'master' of github.com:po-devs/pokemon-online
fixes