MY TC

ORIGINAL SHIT IGNORE PREVIOUS ONE AND PARDON ME
/warn macrarazy,caps
Merge branch 'master' of https://github.com/E4Arsh/Pokemon-Showdown

Conflicts:
	config/commands.js