bb commint
cc commit
Merge branch 'testing2'

Conflicts:
	test.txt