modify gitignore added .classpath
modify .gitignore
classpath
resolve .gitignore confilct