修改vob-vob
Merge branch 'master' of github.com:lizzyphy/watermark_mfc

Conflicts:
	test.suo
	test/RUN.bat
	test/testDlg.cpp