first commit
Merge https://github.com/Memra/predajni_bikon