Delete .classpath
Delete .project
Testing .project and .classpath
Testing .classpath .project
Delete .project~
Merge branch 'New-Feature-X'

Conflicts:
	.classpath
	.project