Update
Merge branch 'master' of https://github.com/alex-yh99/vim

Conflicts:
	vim_shortcut.md