Updated .gitignore so we don't commit over the classpath file and cause
merge errors