fixed
Merge branch 'master' of git://github.com/vimtaku/dotfiles

Conflicts:
	.zshrc