Basic Collaboration with Git: Branching and Merging