joined scouts and badges
Merge branch 'master' of github.com:abmcdubb/troop_hub into joinbadgesandscout