navbar
Merge branch 'jeremy'