Merge pull request #5 from ipri2013/master

adminStrani#9
Merge pull request #9 from nejc92/master

zadnjiCommit
Merge pull request #6 from ipri2013/master

zadnjiCommit