git commit 時にでるエラーを回避
不要
add memo
add vim plugin
slash
Merge branch 'master' into dena

Conflicts:
	.vimrc
Merge branch 'dena'