A
Merge branch 'master' of https://github.com/Lajong/TestRepo

Conflicts:
	new txt.txt