before traslation
Merge branch 'master' of https://github.com/danmacak/ppro-projekt