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

Conflicts:
	1.txt
	4.txt