1.master 中加入Project.txt
1.在jack目录修改
Merge branch 'jack' into tmp

Conflicts:
	project.txt
12212