added email back to teachers signup
conflict fix
Merge branch 'master' of https://github.com/aaronswartz/greendesk
something
Merge branch 'master' of https://github.com/aaronswartz/greendesk
mailer for teacher/notifications