no message
Merge commit 'ad710317a6d8a923f8ed7d3df19beb915cc0c10b'

Conflicts:
	doc/thesis/MSc.aux
	doc/thesis/MSc.log
	doc/thesis/MSc.pdf
	doc/thesis/MSc.synctex.gz
	doc/thesis/MSc.toc
Merge branch 'master' of https://github.com/blauigris/svm
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.toc
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.pdf
	doc/thesis/MSc.synctex.gz
	doc/thesis/MSc.toc
no message
no message
Merge branch 'master' of https://github.com/blauigris/svm