added .gitignore
removing DS_Store
Fixed merge conflicts