getting started with Sinatra
resolved merge conflict