Merge branch 'master' of https://github.com/canis-lupus-albus/dotfiles
add .gitconfig