git test
Merge branch 'newbr'

Conflicts:
	test.txt
Merge branch 'master' into newbr