a
Merge branch 'master' of https://github.com/Vincentvjj/info343Final
fixed nav bar