Merge pull request #54 from nejc92/master

bugfix
Merge pull request #1 from ipri2013/master

bug fixed.
Kaj je sprejeto?
Merge pull request #55 from juree/master

Kaj je sprejeto?
Merge pull request #8 from ipri2013/master

Updating my fork