Merge branch 'master' of https://github.com/hkjn/dotfiles

Conflicts:
	.emacs
Merge branch 'master' of https://github.com/hkjn/dotfiles