.
Merge branch 'master' of github.com:hanabokuro/dot-files

Conflicts:
	emacs/dot.emacs.d/conf/20_tramp.el