add ip
add nother ip
add usergroups
bleh
Merge branch 'master' of https://github.com/kupochu/Pokemon-Showdown

Conflicts:
	rooms.js
fixing proxies
fix again
fix again
add domain
Merge branch 'master' of https://github.com/kupochu/Pokemon-Showdown
add config.js edit
fix error
fix another error
Add tour stuff
Add more tour stuff
Merge branch 'master' of https://github.com/kupochu/Pokemon-Showdown