navbar changes
Merge branch 'master' into steph
Merge pull request #36 from ahsterling/steph

Steph