added 'Auth::user' to navbar pg
fix merge conflict
Merge pull request #42 from andredempsey/andrew

added 'Auth::user' to navbar pg