'we' is not recognized as an internal or external command,
operable program or batch file.
resolve conflict
Merge branch 'master' of https://github.com/NIST-ISG/EigenTextures

Conflicts:
	HaralickDirectionV001/HaralickDirectionV001.sdf
	HaralickDirectionV001/HaralickDirectionV001.v12.suo
	HaralickDirectionV001/HaralickDirectionV001/HaralickDirectionV001.vcxproj.user
	TestImRectanglesV001/TestImRectanglesV001.sdf
	TestImRectanglesV001/TestImRectanglesV001.v12.suo
	TestImRectanglesV002/TestImRectanglesV002.sdf
	TestImRectanglesV002/TestImRectanglesV002.v12.suo