Change README.md
Change my to our
Change my to your
Rollback to try again
Rollback to try again
Change my to your
Change to my
Merge branch 'new_branch'

Conflicts:
	README.md
Start again
Change my to your
Start over
Change my to your
Change my to our
Fix conflicts
Merge pull request #1 from sshamoto/new_branch

Update a new branch