Update zshrc
update
Merge branch 'master' of github.com:Hettomei/my_computer_conf

Conflicts:
	zshrc