Lesson_03_fix merge conflicts

lesson_03/quiz/quiz.yaml

@@ -14,3 +14,7 @@ quiz:
       - $2y$10$hRwUbEYSqz761B.cG79T2uYsYPiEtKu.JgD3Aj7.Mofx27TtX5YHa
       - $2y$10$qE/gXxpq62FEGJOJd9MDA.vpDYLTNSsZbqZLpD/0368CKkcNBzW1y
       - $2y$10$yI/2BgOyqQfLdHM3ixPE5uLu89su/sHRJB2c5szDFIAYXDhRakS.C
+    rmill:
+      - $2y$10$FquR69q7W4E68TX/SNCB7u8Ri0DOFRDqsUPdGfuyIBjZJRVFkNI.6
+      - $2y$10$FSWRA7hulVpyVxd8s67Nxuq/1cdmviW24qqoUbqihBf79cR.w9yly
+      - $2y$10$Qy1IsNsfuJvA384ypL/72uWubUuNbMRp4LD6j/LM0RIH66D/HIjF6

lesson_03/quiz/src/quizzes/quizzes.module.ts

@@ -3,6 +3,7 @@ import { AnotherQuiz } from './another_quiz.js';
 import { AnthonyMaysQuiz } from './anthony_mays_quiz.js';
 import { Jbeyquiz } from './jbeyquiz.js';
 import { MercedesMathewsQuiz } from './mercedes_mathews_quiz.js';
+import { RasheedMillerQuiz } from './rasheed_miller_quiz.js';
 
 export const Quizzes = Symbol.for('Quizzes');
 
@@ -12,6 +13,7 @@ const QUIZ_PROVIDERS = [
   AnotherQuiz,
   MercedesMathewsQuiz,
   Jbeyquiz,
+  RasheedMillerQuiz,
 ];
 
 @Module({

lesson_03/quiz/src/quizzes/rasheed_miller_quiz.ts

@@ -0,0 +1,55 @@
+import {
+  AnswerChoice,
+  MultipleChoiceQuizQuestion,
+} from 'codedifferently-instructional';
+export class RasheedMillerQuiz {
+  getProviderName() {
+    return 'rmill';
+  }
+  makeQuizQuestions() {
+    return [
+      RasheedMillerQuiz.makeQuestion0(),
+      RasheedMillerQuiz.makeQuestion1(),
+      RasheedMillerQuiz.makeQuestion2(),
+    ];
+  }
+  static makeQuestion0() {
+    return new MultipleChoiceQuizQuestion(
+      0,
+      'What command is used to navigate to a different directory in the terminal?',
+      new Map([
+        [AnswerChoice.A, 'cd'],
+        [AnswerChoice.B,'ls'],
+        [AnswerChoice.C,'mkdir'],
+        [AnswerChoice.D, 'rm'],
+      ]),
+      AnswerChoice.UNANSWERED,
+    ); // Replace `UNANSWERED` with the correct answer.
+  }
+  static makeQuestion1() {
+    return new MultipleChoiceQuizQuestion(
+      1,
+      'What is GitHub mainly used for?',
+      new Map([
+        [AnswerChoice.A,'Playing Games'],
+        [AnswerChoice.B, 'Sharing and managing code'],
+        [AnswerChoice.C,'Watching Videos'],
+        [AnswerChoice.D,'Sending Emails'],
+      ]),
+      AnswerChoice.UNANSWERED,
+    ); // Replace `UNANSWERED` with the correct answer.
+  }
+  static makeQuestion2() {
+    return new MultipleChoiceQuizQuestion(
+      2,
+      'What is the primary purpose of the "Inspect" tool in a web browser?',
+      new Map([
+        [AnswerChoice.A, 'Edit website code temporarily'],
+        [AnswerChoice.B, 'Download videos'],
+        [AnswerChoice.C, 'Change website themes'],
+        [AnswerChoice.D,'Install Apps'],
+      ]),
+      AnswerChoice.UNANSWERED,
+    ); // Replace `UNANSWERED` with the correct answer.
+  }
+}