Better datagen
Merge branch 'master' into averagetree

Conflicts:
	results/graph.png
	results/result.csv
Results on test data