remove target from git
remove .classpath and .project
update .gitignore to ignore target, .classpath, .project
merge from master