Merge branch 'master' of https://github.com/github/gitignore

Conflicts:
	Global/OSX.gitignore

diff --cc Global/OSX.gitignore
index ef10493ff6cda240a18496f04cfb490c378f9970,bdc304216d3fd764fb5f64396177bf7d74c271f6..c5efd1780cebb927bd2e2705ba77269e9554cfbc
--- 1/Global/OSX.gitignore
--- 2/Global/OSX.gitignore
+++ b/Global/OSX.gitignore
@@@ -1,10 -1,11 +1,24 @@@
 -.DS_Store\r
 -.AppleDouble\r
 -Icon\r
 -\r
 -\r
 -# Thumbnails\r
 -._*\r
 -\r
 -# Files that might appear on external disk\r
 -.Spotlight-V100\r
 -.Trashes\r
 +.DS_Store
++
++.AppleDouble
++
 +.LSOverride
++
 +Icon
 +
++
++
++
++
 +# Thumbnails
++
 +._*
 +
++
++
 +# Files that might appear on external disk
++
 +.Spotlight-V100
++
 +.Trashes
++