zsh
Merge branch 'master' of github.com:Ju4n/config-files