Treci commit testinga
Merge branch 'master' into moar_txt
Nema bug-a na text 3
Konflikt rjesen
Dodano jos teksta u test2.txt
Merge branch 'moar_txt'