update to fix conflicts with master
Merge pull request #37 from billsaysthis/nav-style-jan5

update to fix conflicts with master