add liujingfeng

Conflicts:

	test.txt