kk
kkMerge branch 'master' of https://github.com/E4Arsh/Pokemon-Showdown

Conflicts:
	config/avatars/Thumbs.db