删除部分文件
Merge branch 'master' of github.com:lizzyphy/watermark_mfc

Conflicts:
	test.sdf
	test.suo
	test/Debug/CL.read.1.tlog
	test/Debug/CL.write.1.tlog
	test/Debug/Format.obj
	test/Debug/cl.command.1.tlog
	test/Debug/link.command.1.tlog
	test/Debug/link.read.1.tlog
	test/Debug/link.write.1.tlog
	test/Debug/mt.command.1.tlog
	test/Debug/mt.read.1.tlog
	test/Debug/rc.command.1.tlog
	test/Debug/rc.read.1.tlog
	test/Debug/rc.write.1.tlog
	test/Debug/stdafx.obj
	test/Debug/test.lastbuildstate
	test/Debug/test.log
	test/Debug/test.obj
	test/Debug/test.pch
	test/Debug/testDlg.obj
	test/Debug/vc100.idb
	test/Debug/vc100.pdb