kk
Merge branch 'master' of https://github.com/AChampAero/Pokemon-Showdown

Conflicts:
	config/config.js