fix nav bar
Merge branch 'master' of https://github.com/Insigniac/CAP-Website