hey!
Merge branch 'master' of https://github.com/svivian/Pokemon-Showdown

Conflicts:
	command-parser.js