testingtestis
Merge branch 'master' of https://github.com/lipovcan5/seminar2-Marinic-Gasparovic