?
Merge branch 'master' of github.com:agnesvanbelle/COSPproject

Conflicts:
	test_clustering.py