a
kolejny folder
Merge remote-tracking branch 'origin/test-branch' into test-branch6

Conflicts:
	Resources/Cards/dataeditortest.txt
f3
abc