[RB_1.0][text.txt][hmJoo] modify test.txt for RB_1.0
[master][test.txt][hmJoo] modify test.txt for master
[RB_1.0][text.txt][hmjoo] modify test.txt for RB_1.0
Merge branch 'RB_1.0'

Conflicts:
	test.txt