I have created a new branch adding in Homework 3 because of a merge bug on my last branch

Author: Dlafferty251

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

@@ -37,11 +37,15 @@ const QUIZ_PROVIDERS = [
   RasheedMillerQuiz,
   DylanLaffertyQuiz,
   RasheedMillerQuiz,
+<<<<<<< HEAD
 <<<<<<< HEAD
   DavidAdenaikeQuiz,
 =======
   DylanLaffertyQuiz,
 >>>>>>> bd49b74 (David Adenaike Quiz (#119))
+=======
+  DavidAdenaikeQuiz,
+>>>>>>> 76dab3b (I have created a new branch adding in Homework 3 because of a merge bug on my last branch)
 ];
 
 @Module({