Changes
Updated
Merge branch 'master' of https://github.com/mgrbyte/nixos-dot-files

Conflicts:
	.emacs-custom.el