Merge branch 'master' of https://github.com/svenstaro/uni-projekt

Conflicts:
report/general.tex
.