Merge branch 'master' of https://github.com/billyfung/bot into bfung

Conflicts:
bot.rb