fix
Merge branch 'master' of https://github.com/wgundamj44/emacs-config

Conflicts:
	.emacs