Add sinatra skeleton
Omigod, please no more merge conflicts
Still solving merge conflicts