report
Merge remote-tracking branch 'remotes/origin/master'

Conflicts:
	doc/3/report.tex
report
Merge branch 'master' of https://github.com/lukaselmer/ethz-machine-learning