change snippets folder's name
テスト
Merge branch 'testing'

Conflicts:
	.vimrc
rest