Moved navbar to master.html so its consistent site wide

also made some css adjustments to main.css and home.css so main is
sitewide and home.css only applies to home.html
Merge branch 'NailasBranch2'