GitHub repository: sjgeyer/merge-conflict-exercise
Created: 2018-02-23T21:15:04Z
Description: Merge Conflict Exercise for lab 15