changes since loggin back in
checking up to date
Merge branch 'create-email-controller'

Bringing app up to speed