update
Merge branch 'master' of https://github.com/Ryuma-Hachisu/dotfiles

Conflicts:
	.emacs.d_mac/abbrev_defs
	.emacs.d_mac/history