command commit

lf

lf2
Merge remote-tracking branch 'origin/master'

Conflicts:
	fork/hogehoge