modified gitconfig
Merge branch 'master' of github.com:ikdysfm/dotfiles

Conflicts:
	.gitconfig