Merge remote-tracking branch 'origin/master' into develop

Jeff Verkoeyen · Jeff Verkoeyen · commit 5d7cae1ba37e · 2016-02-10T12:23:35.000-05:00
diff --git a/.gitignore b/.gitignore
@@ -29,6 +29,9 @@ xcuserdata
 *.xcuserstate
 *.xcscmblueprint
 
+## OS X System files
+.DS_Store
+
 ## Obj-C/Swift specific
 *.hmap
 *.ipa
