Fixed description of Secret Power
Merge pull request #801 from WriggleNightbug/patch-1

Fixed description of Secret Power
Unnerve Fix
Merge pull request #804 from Fuzzysqurl/Unnerve

Unnerve Fix
Merge remote-tracking branch 'origin/master' into battles