OS X obnoxiously generates .DS_Store files in directories. 

Adding them to the .gitignore file will make life easier for 40% of the team. :-)