1.建立dev开发分支，加入project.txt文件
1.在jack目录修改
Merge branch 'jack' into tmp

Conflicts:
	project.txt
12212