basic sinatra set-up
working!
fix merge conflicts