commit - promjena drugi
Merge branch 'master' of https://github.com/CroFranko/repo-1

Conflicts:
	File.txt