GitHub repository: 201-Project-Group-4/mc-exercise
Created: 2019-12-08T00:00:24Z
Description: Merge conflict excercise for lab 15a