My initial init.el from my laptop
Merge remote-tracking branch 'origin/laptop'

Conflicts:
	init.el