created navbar
merge conflict in application.html.erb solved