Aggregate testing jizz
Merge branch 'master' of https://github.com/viggyfresh/DiscoShit

Conflicts:
	classifier.py