updates
try to change .zshrc on server
resolve conflicts
Merge branch 'master' of github.com:andmalc/config