new branch
b1 commit
Merge branch 'master' into branch1

Conflicts:
	test1.txt
Merge pull request #1 from jilse/branch1

Branch1