stuff
Merge branch 'master' of https://github.com/jonasswiatek/itu-diploma-thesis