Update from office.
Ale-black-2 theme change.
Merge branch 'master' of github.com:laynor/emacs-conf

Conflicts:
	custom.el
	init.el
	modules/sm-module-base.el
	packages/sm-package-f.el
	profiles/home-windows.el