BAKA BAKA BAKA
Merge branch 'master' into scikit_preprocess

Conflicts:
	out/kinds.csv
	out/output.csv