2nd
語彙追加
Merge commit '434d126c932e818620865dbd4f87d5aaef8f4435'

Conflicts:
	index.html
no message