Další
Merge branch 'master'

Conflicts:
	Test_02.txt
ML 4
244
Merge branch 'feature-branch-fix'
246
247
Merge branch 'feature-branch'

Conflicts:
	Test_02.txt