izmjena 20.12.
Merge remote-tracking branch 'origin/master'