† fix .gitconfig †
Merge branch 'master' of github.com:manaten/dotfiles