first commit
update
update
	modified:   test_project/test.txt
commmit 2
Merge branch 'master' of https://github.com/loganguan/test_project