Changed the file structure so that the email would work on everyones computer - not sure why it only worked on mine
Merge remote-tracking branch 'origin/master'