Dodal eno vrstico
Merge remote-tracking branch 'origin/master'

Conflicts:
	Novi_fajl_Jaka.txt