immediate
modified templates
tweak the templates
templates tweak
tweaks

- add the links in the emails
towards doing finishing touches
Merge branch 'feature/email' of github.com:camilaachutti/curiosityMachine into feature/email

Conflicts:
	cmemails/templates/email_base.html