Create a new branch
Change my to our
Merge branch 'new_branch'

Conflicts:
	README.md