functioning nav bar
Merge branch 'master' of https://github.com/nickthorpe/finalwebsite