Complete section on branching
Complete section on merge conflicts
Add section on remotes and GitHub