added sections about branching and began writing about merging