Change 2 - branch-1
Change 3 - branch-1
Merge pull request #1 from henriklundahl/branch-1

Branch 1