This is part 2 of the git merging assignment for software engineering.