some automerge integration.
Merge branch 'journal' of github.com:/guyromm/ScratchDocs into journal