Added Diancie and Diamond Storm
Fix some mistakes
Finished fixing up Diamond Storm
Merge pull request #1035 from WriggleNightbug/master

Added Diancie and Diamond Storm