removed comments
updated nav bar
made login box
fixed merge conflicts
Merge pull request #127 from LasseSviland/master

made login box