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

Conflicts:
	test.txt

[master 7bc14f3] Merge branch "RB_1.0'