Merge branch 'master' of github.com:github/gitignore into keep-scm-files

# Conflicts:
#	Objective-C.gitignore
#	Swift.gitignore