updated my e-mail address
Merge branch 'master' into npRmpi

Conflicts:
	README.md
updated my e-mail address