Add email address
Change my to our
Change my to your
Merge branch 'new_branch_2'

Conflicts:
	README.md

Change my to your.