Resolve merge conflicts:

App/assets/stylesheets/application.css
App/views/layouts/application.html.erb
Config/routes.rb
Config/application.rb
Gemfile.lock
Resolve merge conflict:

Config.ru
Sample_app: create test for "sample_app" on home page