存储水印初步
Merge branch 'master' of github.com:lizzyphy/watermark_mfc

Conflicts:
	test/testDlg.cpp
连服务器
Merge branch 'master' of github.com:lizzyphy/watermark_mfc
联网判断水印是否合格