another modify 1st line,make conflict
Merge branch 'master' of https://github.com/gpzuestc/Giton

Conflicts:
	folder/test1.txt