adding mail handler
Resolving conflicts
\
Merge branch 'master' of https://github.com/mondora/scrummaster

Conflicts:
	mailHandler.js