}X^[R~bg
}X^[ɂ±݂�Æ
Merge branch 'master' into hogebranch
コンフリクト解消
Conflicts:
	.vimrc