.gitconfig
Merge branch 'master' of https://github.com/jansanchez/resources

merge
.gitconfig