deleted routes, rebuild layout.erb file
removed files
conflict resolution

Merge branch 'master' of https://github.com/salarkhan/sinatra_blog