mc-exercise

Merge Conflict Exercise for Code 201n16

Team Roles:

Project Overlord (Organization Administrator); Madison

Round 1: Bob = Brett, Carol = Cas, Ted = Thomas, Alice = Madison

Round 2: Bob = Madison, Carol = Brett, Ted = Cas, Alice = Thomas