start listener
Merge branch 'master' of github.com:astiusa/fernando

Conflicts:
	bot.js