set up final implimentation
fixing mail merge conflict
edit to mail.php
Merge branch 'working'
fixed merge conflict
removed all sensitive data before push