fixed conflict
added procfile
oops forgot to close the method
trying to trick it
updating package file for coffeescript
added nano
added pusher
redeploying dokku
Merge branch 'master' of github.com:ratbeard/bingbot

Conflicts:
	package.json