Fix bug.
Merge branch 'master' of github.com:esodov/zsh_config

Conflicts:
	.zsh_mine