with orig files
Merge branch 'master' of https://github.com/tessafallon/sinatra-app