upgrade ruby version from 2.1.2 to 2.1.4
change into single quote from doble quote
modify
change name from main.rb to app.rb
add sinatra-contrib gem
respond to http request(post)
render calculate results
change button attr from submit to button
resolve conflict (I guess my way to use git was not good)
remove conflict messages
remove conflict message
remove blank line