Add a message from user B
Merge branch 'dev_1.0_userB'

Conflicts:
	test.txt