fixing merge
adding .classpath to gitignore