test
Merge branch 'master' of https://github.com/yuanxiliang/test

Conflicts:
	testCopy/test.txt