Fixed .gitignore issues and .DS_Store