changed nav bar to add in user name if user is logged in
Merge branch 'master' into briandexter