Merge sinatra origin into repo