fix merge
Merge branch 'master' of github.com:nobe4/dotfiles
installed brew and z on linux
Merge branch 'master' of github.com:nobe4/dotfiles