message
Merge branch 'master' of https://github.com/tianyisheng/homework

Conflicts:
	hw4/classifier.pickle
add text