conflict
Merge branch 'master' of
https://github.com/scriptkid85/OpenMPI-Kmeans.git

Conflicts:
	openMPI-Kmeans/src/openMPI-main.c