work on .tex
Merge branch 'master' of https://github.com/rok/Diploma
diploma.tex