Merge pull request #1 from Nakupujem/master

Pridane ZF
Merge pull request #2 from Nakupujem/zf

Merge pull request #1 from Nakupujem/master