add mailer stuff
made merge changes
add some changes
lets get this conflict stuff over
Merge branch 'master' of https://github.com/erlaroche/Home_Sit