test
Merge branch 'master' of https://github.com/yaotian/.vim

Conflicts:
	README.md