cmds
Merge branch 'master' of https://github.com/troufster/fulbot

Conflicts:
	conf.js
Hax