add gitignore
removing DS files
merge