another update
Merge remote-tracking branch 'upstream/master'
Merge branch 'master' of https://github.com/Cosym/Pokemon-Showdown

Conflicts:
	config/commands.js

	modified:   commands.js
	modified:   config/commands.js
	modified:   tour.js