pushing to merge
pushing to merge
Merge pull request #30 from Fprince333/master

push for harrison
locations for matches
reference self in registration mailer
resolved merge conflict
removed empty folder
mailer image refs
fixing mailer