se
Merge branch 'master' of https://github.com/xiangcy/machine_learning

Conflicts:
	paper.aux
	paper.log
	paper.pdf
	paper.synctex.gz