modified:   zshrc
Merge branch 'master' of github.com:utada/zshrc

Conflicts:
	zshrc
	modified:   zshrc