Add entry for when pairs disagree#30

calebwoods wants to merge 3 commits intomasterRoleModel/BestPractices:masterfrom

resolving_disagreementsRoleModel/BestPractices:resolving_disagreementsCopy head branch name to clipboard