new kmeans
Merge branch 'master' of github.com:nathanielherman/sto-stamp

Conflicts:
	stamp-0.9.10/kmeans/cluster.hh