Updated all navbars
Merge branch 'master' into justin
Merge pull request #72 from areveal/justin

Justin