add navbar
Merge branch 'master' of github.com:jmburges/jawbonehackathon
add map