- promjena u test2
RESOLVED
Merge branch 'local2'

Conflicts:
	222222.txt