Merge branch 'master' of github.com:github/gitignore into patch-1

Conflicts:
	Python.gitignore