A
Merge branch 'master' of https://github.com/mitsch33/gitLearn

Conflicts:
	FileA.txt