way too many changes at once
Merge commit 'remotes/origin/master~2'
sessionit ignoreen

Conflicts:
	.gitmodules
	init.el
Merge remote-tracking branch 'origin/master'

Conflicts:
	.gitmodules
	init.el