navbar change
Merge branch 'master' into justin
Merge pull request #80 from areveal/justin

Justin