settings

Conflicts:

	personal/custom.el