fff
Merge branch 'master' of https://github.com/xzhy527/qtCanyin

Conflicts:
	test.txt