added a better color?
Merge branch 'develop' of https://github.com/AgreeMates/AgreeMates into develop
Merge branch 'develop' of https://github.com/AgreeMates/AgreeMates into develop
Merge branch 'develop' of https://github.com/AgreeMates/AgreeMates into develop
Merge branch 'develop' of https://github.com/AgreeMates/AgreeMates into develop
returned navbar highlight function
adding navbar.js
merged conflicts
test
updated js comments in server/routes
Merge branch 'testNavbar' of https://github.com/dennisd7/AgreeMates into develop
fixed color
Merge pull request #56 from dennisd7/develop

fix color