work update
Merge branch 'master' of https://github.com/adamczykm/emacs-live

Conflicts:
	init.el