updated styling on nav bar and timer
fixed merge conflict on nav bar in application.html.erb