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