fixed merge conflict in stylesheet
fixed banners but troop show page not working
fixed more merge conflicts
removed ds_store files
merge conflicts
added profile images to seeds
added basic layout to troop members page
styled calendar
Merge branch 'master' of github.com:abmcdubb/troop_hub
Merge branch 'troopsearch'
removed troop search for now
joined scouts and badges
Merge branch 'master' of github.com:abmcdubb/troop_hub into joinbadgesandscout
added news column on show page
Merge branch 'master' of github.com:abmcdubb/troop_hub
changed banner
resized header image
added somewhat normal looking pictures to scouts troop page
home page
more homepage stuff