rr
rrrrr
Merge branch 'master' of https://github.com/troufster/fulbot
Recognize halfops as ops
pls
remove som logs
Update conf.js
cmds
Merge branch 'master' of https://github.com/troufster/fulbot

Conflicts:
	conf.js
Hax
Merge remote-tracking branch 'origin/master' into bruce