modified:   commands.js
	modified:   tour.js
Merge branch 'master' of https://github.com/FrPSServ/Pokemon-Showdown