local changes
Merge branch 'master' of github.com:netguy204/.emacs.d

Conflicts:
	init.el