first commit
merge Merge branch 'master' of https://github.com/sunnyera/emailer