obsidian and...
Merge branch 'master' of https://github.com/pedropenna/.emacs.d
Plus themes and stuff

Conflicts:
	init.el