Merge
Merge branch 'basic_email' of github.com:mdelrosa/sumsurv into add_users
Can add emails to roster
Merge branch 'add_users' of github.com:mdelrosa/sumsurv into add_users
fixed merging issues again