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

Conflicts:
	test.txt