DIR-->DIV
konflikt
Merge branch 'master' of https://github.com/pgorecki/pz2013