conflict resolve between laurie and local master
merge conflict resolved
merge conflict resolved
mailer added into if statement