add first file
add a new file and text fiel
foo3.txt
add new
Merge branch 'branch1'
foot2.txt 88
Merge branch 'branch1'

Conflicts:
	dir1/foot2.txt
Merge branch 'master' of github.com:jichuang1218/demo