Added new aliases
Merge branch 'master' of https://github.com/Zarel/Pokemon-Showdown
Merge pull request #370 from bumbadadabum/master

Added new aliases