branch commit test
master commit test
Merge branch 'RB_1.0'

Conflicts:
	test.txt