Sample salesforce test case
Delete .classpath
Delete .project
Delete org.eclipse.jdt.core.prefs
Merge remote-tracking branch 'upstream/master'