Fix copy bug
Merge branch 'master' of https://github.com/k-yamada/.emacs.d

Conflicts:
	init.el