university-of-toronto-fsf/git-workflow-and-conflicts

The intention of this repository is to demonstrate the github workflow and merge conflicts