Edited 2nd line.
Merge remote-tracking branch 'origin/master' into vim

Conflicts:
	vimfile
Added a wish.