update
Merge branch 'master' of https://github.com/xizhonghua/mlss2014

Conflicts:
	code/handout/code/.classify.m.swp