updating sinatra erb file to take two fields
fixing app.rb overwrite
fixing app.rb on master
fixing app.rb on local branch
Merge branch 'app-files'