add .project
update test.txt
Merge branch 'jun'