resolve conflicts
resolve conflicts

scboucher/hubot,lisb/hubot,hubotio/hubot,lisb/hubot,github/hubot,lisb/hubot,nandub/hubot,scboucher/hubot,decaffeinate-examples/hubot,github/hubot,decaffeinate-examples/hubot,nandub/hubot,PropertyUX/nubot,PropertyUX/nubot,hubotio/hubot