test commit B
Merge branch 'HEAD' of https://github.com/willi-berger/git-test1

Conflicts:
	documentA.txt