Merge branch 'New-Feature-X'
Delete .classpath
Delete .project
Merge branch 'New-Feature-X'

Conflicts:
	.classpath
	.project
Consolidated classes and files
Merge branch 'master' into New-Feature-X