設定を諸々追加
merged.
Excel や PowerPoint の設定を追加
Merge remote-tracking branch 'origin/master'

Conflicts:
	dot.nodoka