fixed the nav
Merge branch 'master' into kayla
Merge pull request #30 from bchiatt/kayla

Kayla