the navbar now scrolls correctly
Merge branch 'master' of https://github.com/nrubin/ElecanismsFinalProject