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

Conflicts:
	config/config-example.js
Stuff
More changes >_>
All these stuff
This
Balance Cup
Balance Cup