fixed merge conflict in stylesheet
fixed banners but troop show page not working
fixed more merge conflicts
removed ds_store files
merge conflicts
styled calendar
Merge branch 'master' of github.com:abmcdubb/troop_hub
Merge branch 'troopsearch'