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

Conflicts:
bot.rb
Merge commit 'd1441ba'
fixed merge conflicts
Conflicts:
	README.md
	bot.rb