Izmenjeno zbog commita
Resen konflikt
Izmena
Merge branch 'master' of https://github.com/stefanpetrovic/ITEH