修正
Merge branch 'master' of github.com:siroken3/dotfiles

Conflicts:
	dot.emacs.d/init.el