'update'
Merge branch 'master' of github.com:koojy/dotfiles

Conflicts:
	home/.oh-my-zsh-custom/path.zsh
	home/.vimrc
Merge branch 'master' of github.com:koojy/dotfiles

Conflicts:
	home/.vimrc