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

Conflicts:
	.vimrc