merge
Merge branch 'master' of github.com:10sr/cellsql_py

Conflicts:
	kmeans_twodim/calc_clusters.csm