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

Conflicts:
	.emacs.d/org-clock-save.el
	Zettelkasten/softwaretechnik.org
#Some more info ....