add git config rule
Merge branch 'master' of github.com:yonez/dotfiles

Conflicts:
	.xcode/CodeSnippets/CodeSnippets