made more pretty
Fixed navbar links
Merge branch 'master' of https://github.com/kpatt1011/project3