OM changes
Merge branch 'master' of https://github.com/Snaquaza/Pokemon-Showdown

Conflicts:
	mods/statswitch/scripts.js