Conflict solved
Merge remote-tracking branch 'origin/master'

Conflicts:
	Solution/Code/classification/Classifier.py
	Solution/Code/classification/ClassifyMain.py