working on agendas
fixed merge conflicts
Merge branch 'master' of github.com:abmcdubb/troop_hub into agendas
agenads
updated banners on various pages; relevant text to the content of the page
Merge branch 'master' of github.com:abmcdubb/troop_hub into agenda_new
Merge pull request #13 from abmcdubb/agenda_new

Agenda new