Add .DS_Store to .gitignore
Some new problems and solutions. Remember folks: NO CHEATING!