stuffs
Merge branch 'master' of https://github.com/Oiawesome/Pokemon-Showdown-Mod

Conflicts:
	README.md