some change
Merge branch 'master' of github.com:cc520/Tools

Conflicts:
	VIM/_vimrc
	VIM/vim73/1.js