Added email signups
Merge branch 'add_email_signup'