dsf
Merge branch 'develop' of http://github.com/meshuai/kmeans

Conflicts:
	kmeans/useless.py