Change navbar to links
Merge branch 'develop' of https://github.com/leylaKapi/project-library into develop