Going through exercises and working on git branching/merging