combined
Merge branch 'master' of https://github.com/Thomasbehan/HTMLProject
Adjusted nav bar
Updated