added scouts_badges join, added more badges
agenda edits
fixed merge conflicts
added tweet button, fixed views
Merge branch 'master' of github.com:abmcdubb/troop_hub into anotherbranch
created user_badges join table
fixed merge conflicts
fixed merge conflicts
Merge pull request #4 from abmcdubb/anotherbranch

Anotherbranch