Merge branch 'master' of https://github.com/sjotterman/config
fixed gitconfig
Merge branch 'master' of https://github.com/sjotterman/config