update
improved zsh settings
improved color
Merge remote-tracking branch 'origin/master'