update
.zshrc
Merge branch 'master' of github.com:cy6erskunk/configs

Conflicts:
	.bashrc