Merge pull request #5 from mdelrosa/basic_email

mergin thangs