Merge branch 'master' of https://github.com/Tacahilo/myzsh
updated