Updated Working with Git branches (asciidoc)
Document an approach for dealing with changes to origin while forward merging
Replace master with main
Organize