popravek k dn
Merge branch 'master' of https://github.com/jozzez1/Seminarji

Needed to merge stuff from laptop and stuff from the desktop computers.