ppj1
Merge remote-tracking branch 'origin/master'

Conflicts:
	Priprema za predaju/analizator/izlazni.txt