Update Gen 6 Pokemon stat estimates
Update Pokemon with new abilities
Merge remote-tracking branch 'upstream/master'