empty sinatra skeleton
added sinatra skeleton
fixed merge conflict