add user to group work
mail tries
conflict fix
conflict fix
changes
changes
Merge branch 'master' of https://github.com/losu/match_bets
conflict fix