local version
Merge branch 'master' of https://github.com/ignazioc/sinatra_sample