troops users join. pundit gem
changed links (troop_users). created user profile link
merge conflicts
brought back troop events controller. created user_badges controller
user badges autocomplete
merge conflicts