Common change
Merge branch 'master' of github.com:hansoln/TestLibA

Conflicts:
	a.txt