konflikt rjesavanje
konflikt
sve
Merge branch 'oldBackup' of https://github.com/teminagic/SI2013Tim3 into oldBackup
konflikt konacno