A repository used to demonstrate merge conflicts in a screencast for UMM's CSci 3601 (Software Design and Development).
We'll use this to illustrate changes to a repo that rarely cause conflicts, followed by changes that almost always lead to conflicts.
The current version of the video: https://www.youtube.com/watch?v=Am6xSrPVX98