Added navbar to master.blade.php
Merge branch 'master' into alex
Merge pull request #35 from blind-squirrel/alex

Alex
Merge branch 'master' into Sharon
fixed formatting on login and still working on security