code used in my phd
Merge branch 'master' of github.com:pthimon/clustering

Conflicts:
	.gitignore