Another line...

in a new branch
Merge pull request #1 from rainboxx/new-change

Another line...

First branch committed last — no conflict!