All new Files
New stuff
More New Stuff
Merge branch 'master' of https://github.com/Snaquaza/Pokemon-Showdown

Conflicts:
	commands.js
	config/formats.js
	data/formats-data.js
	mods/statswitch/scripts.js