some fixes
data sets
Merge branch 'master' of https://github.com/Gospodzin/edami

Conflicts:
	clustering/main.cpp
fixes