added some styling on locations show page and fixed homepage tests to pass
resolving merge conflict in application.html.erb