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