文字の折り返し設定
Merge branch 'master' of https://github.com/k-yamada/.emacs.d

Conflicts:
	elpa/archives/gnu/archive-contents
	init.el