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

Conflicts:
	Global/OSX.gitignore

AppceleratorTitanium.gitignore

+# Build folder and log file
+build/
+build.log

Global/Matlab.gitignore

@@ -9,3 +9,8 @@
 # OSX / *nix default autosave extension
 *.m~
 
+# Compiled MEX binaries (all platforms)
+*.mex*
+
+# Simulink Code Generation	
+slprj/

Global/OSX.gitignore

 .DS_Store
+
+.AppleDouble
+
 .LSOverride
+
 Icon
 
+
+
+
+
 # Thumbnails
+
 ._*
 
+
+
 # Files that might appear on external disk
+
 .Spotlight-V100
+
 .Trashes
+

Objective-C.gitignore

@@ -15,3 +15,4 @@ xcuserdata
 profile
 *.moved-aside
 DerivedData
+.idea/