first commit
add sinatra files
fixed readme conflict