Removed user names from navbar.
Fixed merge conflicts.
Merge pull request #54 from jloehman/lindsey

Removed user names from navbar.