Fix git
Merge remote-tracking branch 'origin/master'

Conflicts:
	ATDD/Queue_SendEmail_Success.txt
Merge branch 'master' of https://github.com/github-sprint3r/khruako