test
Merge remote-tracking branch 'origin/master'

Conflicts:
	lista.txt
test
test

l