Merge branch 'master' of github.com:aythami/hubot

Conflicts:
	doc/README.md