added troop news to show.html.erb
added blog show page
new blog post page is working
created newletter, edited navbar
merge conflicts
udpated seed data for troops blog
made troop events into modals
added profile photos to asset pipeline
fixed troop event modals
fixed merge conflicts
fixed advanced search badges halfway
Merge branch 'master' of github.com:abmcdubb/troop_hub
made events and skils appear in alphabetical order on show pages
skills to adults show page and badges for scouts
pulling from master
Merge branch 'master' of github.com:abmcdubb/troop_hub into agenda_new