test zsh again
Merge branch 'master' of s01en04:~/Dropbox/config