email bug fixed
Merge branch 'master' of github.com:wellincall/project-happiness