Removed old merge conflict code from bottom of question#show view."
added navbar_spec.rb
fixed simplecov merge conflict