modified:   te
	modified:   te
Merge branch 'druga'

Conflicts:
	te

	modified:   te