test2 change
test2 change in br1
Merge branch 'refs/heads/br1'

Signed-off-by: Chabster <chabster@gmail.com>

Conflicts:
	test2.txt