manual merge of email from keith
Manual merge of files through command
Merge branch 'master' of https://github.com/dwise006/EmViNewest