welcome email done
Merge pull request #10 from MaxMck/emailing

welcome email done
no more conflict