druga
Merge branch 'druga'

Conflicts:
	test.txt
up