??
Merge branch 'master' of https://github.com/OMGitsHongyu/ML_project

Conflicts:
	kmeans.py