ひとつだけ漢字
Merge remote-tracking branch 'origin/itemshenging'
1を壱
Merge remote-tracking branch 'origin/master' into itemshenging

Conflicts:
	app.html