DOUGE
Merge branch 'master' of heroku.com:orderup-hubot

Conflicts:
	scripts/orderup_og_memes.coffee
accept c