add branch1/晚上聚餐.txt
add 晚餐
add branch1/晚上聚餐.txt
Merge branch 'night_b1'
modify test.txt
modify test.txt
modify test.txt
modify test.txt
Merge branch 'confilc' into confilc_2

Conflicts:
	test.txt
Merge branch 'confilc_2'

Conflicts:
	test.txt
add dog.txt
modify dog.txt
Merge branch 'fastforward'
Merge branch 'master' of https://github.com/yutin74/git-p3