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

Conflicts:
	.gitconfig