Updated for Gen 6
Merge pull request #490 from HumanDestroyer/patch-1

Updated for Gen 6