Cleanup files in repo. Add DS_Store to .gitignore.
Modify .gitignore to ignore only workspace.xml and tasks.xml from the .idea folder.