Merge branch 'master' of git://github.com/github/gitignore into add-common-linux-compile-file-extensions

Conflicts:
	C.gitignore

Updates done.