commiting before pull
Merge branch 'master' of https://github.com/small-yellow-duck/semi-supervised

Conflicts:
	classifier.py
	project1.sublime-workspace
	run_perceptron_2014_02_16.py