removed .settings and .project
merged
added gitignore