Add two sections on branching
Rename feature branches to topic branches
Rewrite 03 and 04 using new example app
Some fixes and proofreading edits
Add recipe on diff3 merges