conflict
Merge branch 'master' of
https://github.com/zyli5313/Kmeans_Sequential.git

Conflicts:
	KmeansSeq/src/seq-main.c
change makefile