(zsh e,a) docu pull, push
Merge branch 'master' of github.com:ekawa/conf