zsh
vim
Merge branch 'master' of github.com:gyk001/home

Conflicts:
	.gitignore