New zshrc
Merge branch 'master' of github.com:uZer/.minimics

Conflicts:
	zsh/zshrc