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

Conflicts:
	README.md
	vimrc
test