Added username to navbar
Fixed merge conflict.  I like semicolons