fix nav bar
add map
Merge branch 'master' of github.com:IntroHCI/website