druga zmiana
corrected
Merge pull request #1 from o-l-o/task

druga zmiana
f
Merge branch 'task'
Merge branch 'master' into task_2

Conflicts:
	first_file.txt