kod
Merge branch 'master' of github.com:sniqer/masterthesis