Task #2
Merge branch 'master' of https://github.com/mzorec/Jurovska-fara