neco
neco dalsiho
neco
neco
neco
neco
neco
neco
neco pridano v patch3
neco v patch4
neco
Merge branch 'patch3'

Conflicts:
	main.txt
master + patch3
neco
neco
neco
n
n
n
Merge branch 'patch11'

Conflicts:
	main.txt