test/training set
Merge branch 'master' of github.com:dbieber/setfinder

Conflicts:
	evaluate.py
training and test