modify 4.txt
a.txt
modify 4.txt
Merge branch 'glob' of https://github.com/Guobi/Test1 into glob

Conflicts:
	4.txt