configured procfile
edited default.rb
Merge branch 'master' of github.com:cgjohnson/hubox

Conflicts:
	recipes/default.rb