#Some more info ....
Merge branch 'master' of https://github.com/floppycode/home-config

Conflicts:
	.gitignore
	Zettelkasten/logik.org
	Zettelkasten/refile.org
	Zettelkasten/softwaretechnik.org
#Some more info ....