temp
merge
html emails work
improve spacing on text email.
temp
Merge branch 'welcome-email'