Merge branch 'master' of github.com:webBoxio/sinatra-heroku-boilerplate
Merge branch 'master' of github.com:webBoxio/sinatra-heroku-boilerplate