Merge pull request #5 from zapiski/master

Posodobitev
Merge pull request #42 from Osebek/master

Merge pull request #5 from zapiski/master