Merge remote-tracking branch 'upstream/master'

C.gitignore

@@ -1,5 +1,6 @@
 # Object files
 *.o
+*.ko
 
 # Libraries
 *.lib

CONTRIBUTING.md

@@ -0,0 +1,3 @@
+Since this repo includes a large and diverse number of programming languages, frameworks, editors, and ecosystems, it's *very helpful* if you can provide a link to information supporting your pull request. Up-to-date, canonical documentation that mentions the files to be ignored is best.
+
+This ensures we can efficiently go through pull requests and keep quality high.

Global/vim.gitignore

@@ -1,4 +1,4 @@
-.*.s[a-w][a-z]
+*.s[a-w][a-z]
 *.un~
 Session.vim
 .netrwhist

LICENSE

@@ -1,4 +1,4 @@
-Copyright (c) 2012 GitHub, Inc.
+Copyright (c) 2013 GitHub, Inc.
 
 Permission is hereby granted,  free of charge,  to any person obtaining a
 copy of this software and associated documentation files (the "Software"),

Objective-C.gitignore

@@ -15,3 +15,6 @@ profile
 DerivedData
 .idea/
 *.hmap
+
+#CocoaPods
+Pods

Rails.gitignore

@@ -16,3 +16,4 @@ capybara-*.html
 rerun.txt
 pickle-email-*.html
 .project
+config/initializers/secret_token.rb

VisualStudio.gitignore

@@ -15,6 +15,9 @@ build/
 [Bb]in/
 [Oo]bj/
 
+# Enable "build/" folder in the NuGet Packages folder since NuGet packages use it for MSBuild targets
+!packages/*/build/
+
 # MSTest test Results
 [Tt]est[Rr]esult*/
 [Bb]uild[Ll]og.*