add or modify
add or modify sth.
Merge branch 'master' of https://github.com/liuxueyang/VimPlugin

Conflicts:
	vimrc