Added a wish.
Merge remote-tracking branch 'origin/master' into vim

Conflicts:
	vimfile
Merge pull request #2 from exi/vim

Added a wish.