Merge branch 'master' of https://github.com/AxeBane/Showdown-Writing-Bot

Conflicts:
	commands.js