fix
Merge branch 'master' of github.com:crafters/hubot

Conflicts:
	package.json