update
fix
Merge branch 'master' of https://github.com/oppai/.dotfiles

Conflicts:
	.vimrc
	.zprofile