no message
Merge branch 'master' of https://github.com/blauigris/svm

Conflicts:
	doc/thesis/MSc.aux
	doc/thesis/MSc.lof
	doc/thesis/MSc.log
	doc/thesis/MSc.lot
	doc/thesis/MSc.out
	doc/thesis/MSc.pdf
	doc/thesis/MSc.synctex.gz
	doc/thesis/MSc.toc
Merge branch 'master' of https://github.com/blauigris/svm
Merge branch 'master' of https://github.com/blauigris/svm