test
Merge branch 'master' of ssh://git@github.com/O-T-L/OTL.git

Conflicts:
	OptimizationTemplateLibrary/Tests/Utility/KMeans.cpp