运行更新
Merge branch 'master' of github.com:lizzyphy/watermark_mfc

Conflicts:
	test.sdf
	test.suo
shanchu