only for test branch
step1 for test
Merge branch 'jellybean'

Conflicts:
	vimrcs/settings.vim