merged file
fixed email address
Merge branch 'master' of https://github.com/sbagdadi/try_git

Conflicts:
	test.txt