other navbar stuff
Merge branch 'master' of github.com:abmcdubb/troop_hub