vimrc
Merge branch 'master' of github.com:feisuzhu/dotfiles

Conflicts:
	.vimrc