commit
Merge branch 'master' of github.com:Scorpiuszjj/vim

Conflicts:
	.netrwhist