fixed email bug
Merge branch 'master' of http://github.com/augiekaz/groupProject