my vimrc
	new file:   README.txt
	deleted:    README.txt
提高Win32下的兼容性
	modified:   vimrc
Merge remote-tracking branch 'github/master'

Conflicts:
	vimrc