before pull
Merge branch 'master' of https://github.com/8kntn22/.emacs.d

Conflicts:
	ac-comphist.dat
メニューバーの非表示