Merge pull request #12 from zapiski/master

Vesel spremenu
Merge pull request #59 from rokkolesa/master

Merge pull request #12 from zapiski/master