mergin thangs
merge basic_email and add_users
Merge pull request #5 from mdelrosa/basic_email

mergin thangs