mc-exercise

Team mates did not communicate merges, and did not pull the main working directory after merges. This creates compounding conflicts that are difficult to resolve.