Merge pull request #54 from Icarurs/develop

Add logged in user information to the navbar
Merge remote-tracking branch 'upstream/develop' into develop
Merge pull request #55 from Icarurs/develop

Navbar edits
Merge remote-tracking branch 'upstream/develop' into develop
Remove the freaking scaffold.css