jca41 Merge branch 'master' of github.com:jca41/gitsidian