VD
Merge branch 'master' of https://github.com/sophy1/test2

Conflicts:
	VD.sdf
	VD.sln
	VD/Plugin.h
	VD/VD.cpp
	VD/VD.vcxproj
	VD/VD.vcxproj.filters