don't ignore .project
.project
.project back to scm
AgedBrie
merged .project