corrected lab

.idea/workspace.xml

@@ -1,9 +1,13 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <project version="4">
   <component name="ChangeListManager">
+<<<<<<< HEAD
     <list default="true" id="7c067e32-f3c4-46c3-90e9-a9b9f12f1b24" name="Default Changelist" comment="">
       <change beforePath="$PROJECT_DIR$/.idea/workspace.xml" beforeDir="false" afterPath="$PROJECT_DIR$/.idea/workspace.xml" afterDir="false" />
     </list>
+=======
+    <list default="true" id="7c067e32-f3c4-46c3-90e9-a9b9f12f1b24" name="Default Changelist" comment="" />
+>>>>>>> parent of def5f28... completed enum
     <ignored path="$PROJECT_DIR$/target/" />
     <option name="EXCLUDED_CONVERTED_TO_IGNORED" value="true" />
     <option name="SHOW_DIALOG" value="false" />
@@ -11,6 +15,28 @@
     <option name="HIGHLIGHT_NON_ACTIVE_CHANGELIST" value="false" />
     <option name="LAST_RESOLUTION" value="IGNORE" />
   </component>
+  <component name="DockManager">
+    <window id="1">
+      <content type="file-editors">
+        <state>
+          <leaf>
+            <file pinned="false" current-in-tab="true">
+              <entry file="file://$PROJECT_DIR$/README.md">
+                <provider selected="true" editor-type-id="split-provider[text-editor;markdown-preview-editor]">
+                  <state split_layout="SPLIT">
+                    <first_editor relative-caret-position="510">
+                      <caret line="34" column="9" lean-forward="true" selection-start-line="34" selection-start-column="9" selection-end-line="34" selection-end-column="9" />
+                    </first_editor>
+                    <second_editor />
+                  </state>
+                </provider>
+              </entry>
+            </file>
+          </leaf>
+        </state>
+      </content>
+    </window>
+  </component>
   <component name="FUSProjectUsageTrigger">
     <session id="-1479912162">
       <usages-collector id="statistics.lifecycle.project">
@@ -27,25 +53,25 @@
       <usages-collector id="statistics.file.extensions.open">
         <counts>
           <entry key="class" value="7" />
-          <entry key="java" value="72" />
-          <entry key="md" value="4" />
+          <entry key="java" value="67" />
+          <entry key="md" value="2" />
         </counts>
       </usages-collector>
       <usages-collector id="statistics.file.types.open">
         <counts>
           <entry key="CLASS" value="7" />
-          <entry key="JAVA" value="72" />
-          <entry key="Markdown" value="4" />
+          <entry key="JAVA" value="67" />
+          <entry key="Markdown" value="2" />
         </counts>
       </usages-collector>
       <usages-collector id="statistics.file.extensions.edit">
         <counts>
-          <entry key="java" value="7016" />
+          <entry key="java" value="6683" />
         </counts>
       </usages-collector>
       <usages-collector id="statistics.file.types.edit">
         <counts>
-          <entry key="JAVA" value="7016" />
+          <entry key="JAVA" value="6683" />
         </counts>
       </usages-collector>
       <usages-collector id="statistics.js.language.service.starts" />
@@ -59,6 +85,15 @@
       <split-first>
         <leaf SIDE_TABS_SIZE_LIMIT_KEY="300">
           <file pinned="false" current-in-tab="false">
+            <entry file="file://$PROJECT_DIR$/src/main/java/io/zipcoder/interfaces/Student.java">
+              <provider selected="true" editor-type-id="text-editor">
+                <state relative-caret-position="75">
+                  <caret line="5" column="23" selection-start-line="5" selection-start-column="23" selection-end-line="5" selection-end-column="23" />
+                </state>
+              </provider>
+            </entry>
+          </file>
+          <file pinned="false" current-in-tab="false">
             <entry file="file://$PROJECT_DIR$/src/main/java/io/zipcoder/interfaces/Person.java">
               <provider selected="true" editor-type-id="text-editor">
                 <state relative-caret-position="30">
@@ -81,6 +116,15 @@
             </entry>
           </file>
           <file pinned="false" current-in-tab="false">
+            <entry file="file://$PROJECT_DIR$/src/main/java/io/zipcoder/interfaces/Students.java">
+              <provider selected="true" editor-type-id="text-editor">
+                <state relative-caret-position="60">
+                  <caret line="4" column="44" lean-forward="true" selection-start-line="4" selection-start-column="28" selection-end-line="4" selection-end-column="44" />
+                </state>
+              </provider>
+            </entry>
+          </file>
+          <file pinned="false" current-in-tab="false">
             <entry file="file://$PROJECT_DIR$/src/main/java/io/zipcoder/interfaces/Teacher.java">
               <provider selected="true" editor-type-id="text-editor">
                 <state relative-caret-position="60">
@@ -89,11 +133,16 @@
               </provider>
             </entry>
           </file>
-          <file pinned="false" current-in-tab="true">
+          <file pinned="false" current-in-tab="false">
             <entry file="file://$PROJECT_DIR$/src/main/java/io/zipcoder/interfaces/People.java">
               <provider selected="true" editor-type-id="text-editor">
+<<<<<<< HEAD
                 <state relative-caret-position="315">
                   <caret line="27" column="5" selection-start-line="27" selection-start-column="5" selection-end-line="27" selection-end-column="5" />
+=======
+                <state relative-caret-position="420">
+                  <caret line="34" column="13" selection-start-line="34" selection-start-column="13" selection-end-line="34" selection-end-column="13" />
+>>>>>>> parent of def5f28... completed enum
                   <folding>
                     <element signature="imports" expanded="true" />
                   </folding>
@@ -101,11 +150,16 @@
               </provider>
             </entry>
           </file>
-          <file pinned="false" current-in-tab="false">
+          <file pinned="false" current-in-tab="true">
             <entry file="file://$PROJECT_DIR$/src/main/java/io/zipcoder/interfaces/Educator.java">
               <provider selected="true" editor-type-id="text-editor">
+<<<<<<< HEAD
                 <state relative-caret-position="405">
                   <caret line="33" selection-start-line="33" selection-end-line="33" />
+=======
+                <state relative-caret-position="300">
+                  <caret line="20" lean-forward="true" selection-start-line="20" selection-end-line="20" />
+>>>>>>> parent of def5f28... completed enum
                 </state>
               </provider>
             </entry>
@@ -113,10 +167,15 @@
           <file pinned="false" current-in-tab="false">
             <entry file="file://$PROJECT_DIR$/src/main/java/io/zipcoder/interfaces/Instructors.java">
               <provider selected="true" editor-type-id="text-editor">
+<<<<<<< HEAD
                 <state relative-caret-position="195">
                   <caret line="13" column="41" selection-start-line="13" selection-start-column="41" selection-end-line="13" selection-end-column="41" />
+=======
+                <state relative-caret-position="315">
+                  <caret line="23" column="28" selection-start-line="23" selection-start-column="28" selection-end-line="23" selection-end-column="28" />
+>>>>>>> parent of def5f28... completed enum
                   <folding>
-                    <element signature="e#244#254#0" expanded="true" />
+                    <element signature="e#243#252#0" expanded="true" />
                   </folding>
                 </state>
               </provider>
@@ -125,8 +184,13 @@
           <file pinned="false" current-in-tab="false">
             <entry file="file://$PROJECT_DIR$/src/test/java/io/zipcoder/interfaces/testHostLecture.java">
               <provider selected="true" editor-type-id="text-editor">
+<<<<<<< HEAD
                 <state relative-caret-position="375">
                   <caret line="27" column="28" selection-start-line="27" selection-start-column="28" selection-end-line="27" selection-end-column="28" />
+=======
+                <state>
+                  <caret column="31" selection-start-column="31" selection-end-column="31" />
+>>>>>>> parent of def5f28... completed enum
                   <folding>
                     <element signature="imports" expanded="true" />
                   </folding>
@@ -137,21 +201,27 @@
         </leaf>
       </split-first>
       <split-second>
+<<<<<<< HEAD
         <leaf SIDE_TABS_SIZE_LIMIT_KEY="300">
           <file pinned="false" current-in-tab="true">
             <entry file="file://$PROJECT_DIR$/src/main/java/io/zipcoder/interfaces/Instructor.java">
+=======
+        <leaf>
+          <file pinned="false" current-in-tab="true">
+            <entry file="file://$PROJECT_DIR$/src/main/java/io/zipcoder/interfaces/Instructors.java">
+>>>>>>> parent of def5f28... completed enum
               <provider selected="true" editor-type-id="text-editor">
-                <state relative-caret-position="60">
-                  <caret line="4" column="23" selection-start-line="4" selection-start-column="23" selection-end-line="4" selection-end-column="23" />
+                <state relative-caret-position="315">
+                  <caret line="23" column="28" selection-start-line="23" selection-start-column="28" selection-end-line="23" selection-end-column="28" />
                   <folding>
-                    <element signature="e#381#382#0" expanded="true" />
-                    <element signature="e#406#407#0" expanded="true" />
+                    <element signature="e#243#252#0" expanded="true" />
                   </folding>
                 </state>
               </provider>
             </entry>
           </file>
           <file pinned="false" current-in-tab="false">
+<<<<<<< HEAD
             <entry file="file://$PROJECT_DIR$/src/main/java/io/zipcoder/interfaces/Student.java">
               <provider selected="true" editor-type-id="text-editor">
                 <state relative-caret-position="225">
@@ -195,6 +265,12 @@
                     <caret line="21" column="16" selection-start-line="21" selection-start-column="16" selection-end-line="21" selection-end-column="16" />
                   </first_editor>
                   <second_editor />
+=======
+            <entry file="file://$PROJECT_DIR$/src/main/java/io/zipcoder/interfaces/Instructor.java">
+              <provider selected="true" editor-type-id="text-editor">
+                <state relative-caret-position="363">
+                  <caret line="31" column="36" lean-forward="true" selection-start-line="31" selection-start-column="36" selection-end-line="31" selection-end-column="36" />
+>>>>>>> parent of def5f28... completed enum
                 </state>
               </provider>
             </entry>
@@ -207,8 +283,8 @@
     <option name="RECENT_TEMPLATES">
       <list>
         <option value="Interface" />
-        <option value="Enum" />
         <option value="Class" />
+        <option value="Enum" />
       </list>
     </option>
   </component>
@@ -236,16 +312,15 @@
         <option value="$PROJECT_DIR$/src/test/java/io/zipcoder/interfaces/TestInstructor.java" />
         <option value="$PROJECT_DIR$/src/test/java/io/zipcoder/interfaces/TestStudents.java" />
         <option value="$PROJECT_DIR$/src/test/java/io/zipcoder/interfaces/TestInstructors.java" />
+        <option value="$PROJECT_DIR$/src/test/java/io/zipcoder/interfaces/TestPeople.java" />
         <option value="$PROJECT_DIR$/src/main/java/io/zipcoder/interfaces/Learner.java" />
+        <option value="$PROJECT_DIR$/src/test/java/io/zipcoder/interfaces/testHostLecture.java" />
+        <option value="$PROJECT_DIR$/src/main/java/io/zipcoder/interfaces/People.java" />
         <option value="$PROJECT_DIR$/src/main/java/io/zipcoder/interfaces/Students.java" />
         <option value="$PROJECT_DIR$/src/main/java/io/zipcoder/interfaces/ZipCodeWilmington.java" />
-        <option value="$PROJECT_DIR$/src/main/java/io/zipcoder/interfaces/Educator.java" />
-        <option value="$PROJECT_DIR$/src/test/java/io/zipcoder/interfaces/EducatorTest.java" />
-        <option value="$PROJECT_DIR$/src/main/java/io/zipcoder/interfaces/Instructors.java" />
         <option value="$PROJECT_DIR$/src/main/java/io/zipcoder/interfaces/Instructor.java" />
-        <option value="$PROJECT_DIR$/src/test/java/io/zipcoder/interfaces/testHostLecture.java" />
-        <option value="$PROJECT_DIR$/src/main/java/io/zipcoder/interfaces/People.java" />
-        <option value="$PROJECT_DIR$/src/test/java/io/zipcoder/interfaces/TestPeople.java" />
+        <option value="$PROJECT_DIR$/src/main/java/io/zipcoder/interfaces/Instructors.java" />
+        <option value="$PROJECT_DIR$/src/main/java/io/zipcoder/interfaces/Educator.java" />
       </list>
     </option>
   </component>
@@ -267,9 +342,16 @@
     </treeState>
   </component>
   <component name="ProjectFrameBounds">
+<<<<<<< HEAD
     <option name="y" value="30" />
     <option name="width" value="1440" />
     <option name="height" value="797" />
+=======
+    <option name="x" value="-210" />
+    <option name="y" value="-1035" />
+    <option name="width" value="1656" />
+    <option name="height" value="979" />
+>>>>>>> parent of def5f28... completed enum
   </component>
   <component name="ProjectLevelVcsManager" settingsEditedManually="true" />
   <component name="ProjectView">
@@ -342,7 +424,11 @@
   <component name="PropertiesComponent">
     <property name="WebServerToolWindowFactoryState" value="false" />
     <property name="aspect.path.notification.shown" value="true" />
+<<<<<<< HEAD
     <property name="com.android.tools.idea.instantapp.provision.ProvisionBeforeRunTaskProvider.myTimeStamp" value="1542642091363" />
+=======
+    <property name="com.android.tools.idea.instantapp.provision.ProvisionBeforeRunTaskProvider.myTimeStamp" value="1542498512431" />
+>>>>>>> parent of def5f28... completed enum
     <property name="last_opened_file_path" value="$PROJECT_DIR$" />
     <property name="nodejs_interpreter_path.stuck_in_default_project" value="undefined stuck path" />
     <property name="nodejs_npm_path_reset_for_default_project" value="true" />
@@ -367,8 +453,8 @@
       </list>
     </option>
   </component>
-  <component name="RunManager" selected="JUnit.TestPeople.testRemoveAll">
-    <configuration name="TestPeople" type="JUnit" factoryName="JUnit" temporary="true" nameIsGenerated="true">
+  <component name="RunManager" selected="JUnit.io.zipcoder.interfaces in interfaces-1">
+    <configuration name="TestInstructors.testInitializationSetupInstructors" type="JUnit" factoryName="JUnit" temporary="true" nameIsGenerated="true">
       <module name="interfaces-1" />
       <extension name="coverage">
         <pattern>
@@ -377,12 +463,14 @@
         </pattern>
       </extension>
       <option name="PACKAGE_NAME" value="io.zipcoder.interfaces" />
-      <option name="MAIN_CLASS_NAME" value="io.zipcoder.interfaces.TestPeople" />
+      <option name="MAIN_CLASS_NAME" value="io.zipcoder.interfaces.TestInstructors" />
+      <option name="METHOD_NAME" value="testInitializationSetupInstructors" />
+      <option name="TEST_OBJECT" value="method" />
       <method v="2">
         <option name="Make" enabled="true" />
       </method>
     </configuration>
-    <configuration name="TestPeople.testRemoveAll" type="JUnit" factoryName="JUnit" temporary="true" nameIsGenerated="true">
+    <configuration name="TestPeople" type="JUnit" factoryName="JUnit" temporary="true" nameIsGenerated="true">
       <module name="interfaces-1" />
       <extension name="coverage">
         <pattern>
@@ -392,8 +480,6 @@
       </extension>
       <option name="PACKAGE_NAME" value="io.zipcoder.interfaces" />
       <option name="MAIN_CLASS_NAME" value="io.zipcoder.interfaces.TestPeople" />
-      <option name="METHOD_NAME" value="testRemoveAll" />
-      <option name="TEST_OBJECT" value="method" />
       <method v="2">
         <option name="Make" enabled="true" />
       </method>
@@ -445,17 +531,17 @@
     <list>
       <item itemvalue="JUnit.io.zipcoder.interfaces in interfaces-1" />
       <item itemvalue="JUnit.TestPeople" />
+      <item itemvalue="JUnit.TestInstructors.testInitializationSetupInstructors" />
       <item itemvalue="JUnit.TestStudents" />
       <item itemvalue="JUnit.testHostLecture.testHostLecture" />
-      <item itemvalue="JUnit.TestPeople.testRemoveAll" />
     </list>
     <recent_temporary>
       <list>
-        <item itemvalue="JUnit.TestPeople.testRemoveAll" />
-        <item itemvalue="JUnit.TestPeople" />
         <item itemvalue="JUnit.io.zipcoder.interfaces in interfaces-1" />
         <item itemvalue="JUnit.testHostLecture.testHostLecture" />
         <item itemvalue="JUnit.TestStudents" />
+        <item itemvalue="JUnit.TestInstructors.testInitializationSetupInstructors" />
+        <item itemvalue="JUnit.TestPeople" />
       </list>
     </recent_temporary>
   </component>
@@ -482,13 +568,29 @@
       <workItem from="1542224574521" duration="5206000" />
       <workItem from="1542375261055" duration="1034000" />
       <workItem from="1542396862627" duration="5617000" />
+<<<<<<< HEAD
       <workItem from="1542496077252" duration="7293000" />
       <workItem from="1543245450551" duration="13000" />
       <workItem from="1543544147995" duration="478000" />
+=======
+      <workItem from="1542496077252" duration="1905000" />
+>>>>>>> parent of def5f28... completed enum
     </task>
     <servers />
   </component>
   <component name="TestHistory">
+<<<<<<< HEAD
+=======
+    <history-entry file="TestPeople - 2018.11.16 at 14h 39m 59s.xml">
+      <configuration name="TestPeople" configurationId="JUnit" />
+    </history-entry>
+    <history-entry file="io_zipcoder_interfaces_in_interfaces-1 - 2018.11.16 at 14h 40m 23s.xml">
+      <configuration name="io.zipcoder.interfaces in interfaces-1" configurationId="JUnit" />
+    </history-entry>
+    <history-entry file="TestInstructors_testInitializationSetupInstructors - 2018.11.16 at 14h 40m 58s.xml">
+      <configuration name="TestInstructors.testInitializationSetupInstructors" configurationId="JUnit" />
+    </history-entry>
+>>>>>>> parent of def5f28... completed enum
     <history-entry file="TestInstructors_testInitializationSetupInstructors - 2018.11.16 at 14h 41m 33s.xml">
       <configuration name="TestInstructors.testInitializationSetupInstructors" configurationId="JUnit" />
     </history-entry>
@@ -510,6 +612,7 @@
     <history-entry file="io_zipcoder_interfaces_in_interfaces-1 - 2018.11.16 at 14h 47m 47s.xml">
       <configuration name="io.zipcoder.interfaces in interfaces-1" configurationId="JUnit" />
     </history-entry>
+<<<<<<< HEAD
     <history-entry file="io_zipcoder_interfaces_in_interfaces-1 - 2018.11.18 at 14h 04m 00s.xml">
       <configuration name="io.zipcoder.interfaces in interfaces-1" configurationId="JUnit" />
     </history-entry>
@@ -557,6 +660,17 @@
     </layout>
     <layout-to-restore>
       <window_info active="true" content_ui="combo" id="Project" order="0" visible="true" weight="0.17453505" />
+=======
+  </component>
+  <component name="TimeTrackingManager">
+    <option name="totallyTimeSpent" value="46387000" />
+  </component>
+  <component name="ToolWindowManager">
+    <frame x="-210" y="-1035" width="1656" height="979" extended-state="0" />
+    <editor active="true" />
+    <layout>
+      <window_info active="true" content_ui="combo" id="Project" order="0" visible="true" weight="0.15179677" />
+>>>>>>> parent of def5f28... completed enum
       <window_info id="Structure" order="1" side_tool="true" weight="0.25" />
       <window_info id="Image Layers" order="2" />
       <window_info id="Designer" order="3" />
@@ -574,7 +688,7 @@
       <window_info anchor="bottom" id="Database Changes" order="8" show_stripe_button="false" />
       <window_info anchor="bottom" id="Terminal" order="9" />
       <window_info anchor="bottom" id="Event Log" order="10" side_tool="true" />
-      <window_info anchor="bottom" id="Messages" order="11" visible="true" weight="0.24822696" />
+      <window_info anchor="bottom" id="Messages" order="11" visible="true" weight="0.427283" />
       <window_info anchor="right" id="Commander" internal_type="SLIDING" order="0" type="SLIDING" weight="0.4" />
       <window_info anchor="right" id="Ant Build" order="1" weight="0.25" />
       <window_info anchor="right" content_ui="combo" id="Hierarchy" order="2" weight="0.25" />
@@ -584,7 +698,7 @@
       <window_info anchor="right" id="Theme Preview" order="6" />
       <window_info anchor="right" id="Palette&#9;" order="7" />
       <window_info anchor="right" id="Maven Projects" order="8" />
-    </layout-to-restore>
+    </layout>
   </component>
   <component name="TypeScriptGeneratedFilesManager">
     <option name="version" value="1" />
@@ -632,6 +746,13 @@
         </state>
       </provider>
     </entry>
+    <entry file="file://$PROJECT_DIR$/src/test/java/io/zipcoder/interfaces/TestPeople.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="930">
+          <caret line="66" selection-start-line="66" selection-end-line="66" />
+        </state>
+      </provider>
+    </entry>
     <entry file="file://$PROJECT_DIR$/src/test/java/io/zipcoder/interfaces/StudentTest.java">
       <provider selected="true" editor-type-id="text-editor">
         <state relative-caret-position="384">
@@ -643,10 +764,6 @@
       <provider selected="true" editor-type-id="text-editor">
         <state relative-caret-position="210">
           <caret line="18" column="35" selection-start-line="18" selection-start-column="35" selection-end-line="18" selection-end-column="35" />
-          <folding>
-            <element signature="e#188#189#0" expanded="true" />
-            <element signature="e#242#243#0" expanded="true" />
-          </folding>
         </state>
       </provider>
     </entry>
@@ -674,10 +791,20 @@
         </state>
       </provider>
     </entry>
+<<<<<<< HEAD
     <entry file="file://$PROJECT_DIR$/src/main/java/io/zipcoder/interfaces/Person.java">
       <provider selected="true" editor-type-id="text-editor">
         <state relative-caret-position="30">
           <caret line="2" column="20" selection-start-line="2" selection-start-column="20" selection-end-line="2" selection-end-column="20" />
+=======
+    <entry file="file://$PROJECT_DIR$/src/test/java/io/zipcoder/interfaces/testHostLecture.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state>
+          <caret column="31" selection-start-column="31" selection-end-column="31" />
+          <folding>
+            <element signature="imports" expanded="true" />
+          </folding>
+>>>>>>> parent of def5f28... completed enum
         </state>
       </provider>
     </entry>
@@ -692,8 +819,9 @@
         </state>
       </provider>
     </entry>
-    <entry file="file://$PROJECT_DIR$/src/main/java/io/zipcoder/interfaces/Teacher.java">
+    <entry file="file://$PROJECT_DIR$/src/main/java/io/zipcoder/interfaces/Person.java">
       <provider selected="true" editor-type-id="text-editor">
+<<<<<<< HEAD
         <state relative-caret-position="60">
           <caret line="4" column="24" selection-start-line="4" selection-start-column="24" selection-end-line="4" selection-end-column="24" />
         </state>
@@ -703,11 +831,16 @@
       <provider selected="true" editor-type-id="text-editor">
         <state relative-caret-position="405">
           <caret line="33" selection-start-line="33" selection-end-line="33" />
+=======
+        <state relative-caret-position="30">
+          <caret line="2" column="20" selection-start-line="2" selection-start-column="20" selection-end-line="2" selection-end-column="20" />
+>>>>>>> parent of def5f28... completed enum
         </state>
       </provider>
     </entry>
-    <entry file="file://$PROJECT_DIR$/src/main/java/io/zipcoder/interfaces/Instructors.java">
+    <entry file="file://$PROJECT_DIR$/src/main/java/io/zipcoder/interfaces/Students.java">
       <provider selected="true" editor-type-id="text-editor">
+<<<<<<< HEAD
         <state relative-caret-position="195">
           <caret line="13" column="41" selection-start-line="13" selection-start-column="41" selection-end-line="13" selection-end-column="41" />
           <folding>
@@ -733,22 +866,47 @@
           <folding>
             <element signature="imports" expanded="true" />
           </folding>
+=======
+        <state relative-caret-position="60">
+          <caret line="4" column="44" lean-forward="true" selection-start-line="4" selection-start-column="28" selection-end-line="4" selection-end-column="44" />
         </state>
       </provider>
     </entry>
-    <entry file="file://$PROJECT_DIR$/src/main/java/io/zipcoder/interfaces/Instructor.java">
+    <entry file="file://$PROJECT_DIR$/src/main/java/io/zipcoder/interfaces/People.java">
       <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="60">
-          <caret line="4" column="23" selection-start-line="4" selection-start-column="23" selection-end-line="4" selection-end-column="23" />
+        <state relative-caret-position="420">
+          <caret line="34" column="13" selection-start-line="34" selection-start-column="13" selection-end-line="34" selection-end-column="13" />
           <folding>
-            <element signature="e#381#382#0" expanded="true" />
-            <element signature="e#406#407#0" expanded="true" />
+            <element signature="imports" expanded="true" />
           </folding>
         </state>
       </provider>
     </entry>
     <entry file="file://$PROJECT_DIR$/src/main/java/io/zipcoder/interfaces/Student.java">
       <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="75">
+          <caret line="5" column="23" selection-start-line="5" selection-start-column="23" selection-end-line="5" selection-end-column="23" />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/main/java/io/zipcoder/interfaces/Teacher.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="60">
+          <caret line="4" column="24" lean-forward="true" selection-start-line="4" selection-start-column="24" selection-end-line="4" selection-end-column="24" />
+>>>>>>> parent of def5f28... completed enum
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/main/java/io/zipcoder/interfaces/Instructor.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="363">
+          <caret line="31" column="36" lean-forward="true" selection-start-line="31" selection-start-column="36" selection-end-line="31" selection-end-column="36" />
+        </state>
+      </provider>
+    </entry>
+<<<<<<< HEAD
+    <entry file="file://$PROJECT_DIR$/src/main/java/io/zipcoder/interfaces/Student.java">
+      <provider selected="true" editor-type-id="text-editor">
         <state relative-caret-position="225">
           <caret line="17" column="38" selection-start-line="17" selection-start-column="18" selection-end-line="17" selection-end-column="38" />
         </state>
@@ -780,6 +938,30 @@
         <state split_layout="SPLIT">
           <first_editor relative-caret-position="315">
             <caret line="21" column="16" selection-start-line="21" selection-start-column="16" selection-end-line="21" selection-end-column="16" />
+=======
+    <entry file="file://$PROJECT_DIR$/src/main/java/io/zipcoder/interfaces/Instructors.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="315">
+          <caret line="23" column="28" selection-start-line="23" selection-start-column="28" selection-end-line="23" selection-end-column="28" />
+          <folding>
+            <element signature="e#243#252#0" expanded="true" />
+          </folding>
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/main/java/io/zipcoder/interfaces/Educator.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="300">
+          <caret line="20" lean-forward="true" selection-start-line="20" selection-end-line="20" />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/README.md">
+      <provider selected="true" editor-type-id="split-provider[text-editor;markdown-preview-editor]">
+        <state split_layout="SPLIT">
+          <first_editor relative-caret-position="510">
+            <caret line="34" column="9" lean-forward="true" selection-start-line="34" selection-start-column="9" selection-end-line="34" selection-end-column="9" />
+>>>>>>> parent of def5f28... completed enum
           </first_editor>
           <second_editor />
         </state>

src/main/java/io/zipcoder/interfaces/Educator.java

@@ -11,23 +11,12 @@ public enum Educator implements Teacher {
     LEON(6L);
 
     private double timeWorked;
-    private long id;
-
-    Educator(long id){
-        this.id=id;
-    }
-
-    public long getId() {
-        return id;
-    }
 
     public void teach(Learner learner, double numberOfHours) {
-        learner.learn(numberOfHours);
+
     }
 
     public void lecture(ArrayList<Learner> learners, double numberOfHours) {
-        for (Learner kid : learners){
-            kid.learn(numberOfHours/learners.size());
-        }
+
     }
 }

src/main/java/io/zipcoder/interfaces/Instructor.java

@@ -6,17 +6,11 @@ public class Instructor extends Person implements Teacher {
 
     private String name;
     private Instructors instructors = Instructors.getInstance();
-    private long id;
 
 
     public Instructor(long id, String name) {
         super(id,name);
         this.name=name;
-        this.id=id;
-    }
-
-    public long getid() {
-        return id;
     }
 
     public void teach(Learner learner, double numHours){
@@ -31,15 +25,16 @@ public class Instructor extends Person implements Teacher {
     }
 
 
+    public Instructor findById(long id) {
+        Instructor result = null;
+        for ( Instructor instructor: instructors.getArray()){
+            if (instructor.getiD() == id){
+                result = instructor;
+            }
+        }
+        return result;
+    }
 
-//    public Educator findById(long id) {
-//        Educator result = null;
-//        for ( Educator instructor : instructors.getArray()){
-//            if (instructor.getId() == id){
-//                result = instructor;
-//            }
-//        }
-//        return result;
-//    }
+    
 
 }

src/main/java/io/zipcoder/interfaces/Instructors.java

@@ -5,23 +5,23 @@ import java.util.ArrayList;
 public final class Instructors<E extends Person> extends People{
 
     private static final Instructors INSTANCE = new Instructors();
-    ArrayList<Educator> teacherList=new ArrayList<Educator>();
+    ArrayList<Teacher> teacherList=new ArrayList<Teacher>();
 
 
     private Instructors() {
-        teacherList.add(Educator.CHRIS);
-        teacherList.add(Educator.NHU);
-        teacherList.add(Educator.WILHEM);
-        teacherList.add(Educator.DOLIO);
-        teacherList.add(Educator.FROILAN);
-        teacherList.add(Educator.LEON);
+        teacherList.add(new Instructor(1L, "Chris"));
+        teacherList.add(new Instructor(2L, "Nhu"));
+        teacherList.add(new Instructor(3L, "Wilhem"));
+        teacherList.add(new Instructor(4L, "Dolio"));
+        teacherList.add(new Instructor(5L, "Froilan"));
+        teacherList.add(new Instructor(6L, "Leon"));
     }
 
     public static Instructors getInstance(){
         return INSTANCE;
     }
 
-    public ArrayList<Educator> getArray() {
+    public ArrayList<Teacher> getArray() {
         return teacherList;
     }
 

src/main/java/io/zipcoder/interfaces/People.java

@@ -42,12 +42,4 @@ public abstract class People<T extends Person> {
     public void removeAll() {
         personList.removeAll(personList);
     }
-
-    public class PeopleMock extends People{
-
-
-        public ArrayList getArray() {
-            return null;
-        }
-    }
 }

src/test/java/io/zipcoder/interfaces/EducatorTest.java

@@ -1,11 +0,0 @@
-package io.zipcoder.interfaces;
-
-import org.junit.Test;
-
-public class EducatorTest {
-
-
-
-//    @Test
-
-}

src/test/java/io/zipcoder/interfaces/TestPeople.java

@@ -9,14 +9,14 @@ import java.util.ArrayList;
 
 public class TestPeople {
 
-    People.PeopleMock people;
+    People people;
     Person person;
     Person person2;
     Person person3;
 
     @Before
     public void setup(){
-
+        people = new People();
         person = new Person((long)1, "Jane");
         person2 = new Person((long)2, "Jill");
         person3 = new Person((long)3, "Jack");

src/test/java/io/zipcoder/interfaces/testHostLecture.java

@@ -19,13 +19,13 @@ public class testHostLecture {
     @Test
     public void testHostLecture(){
         ZipCodeWilmington zip = ZipCodeWilmington.getInstance();
-        Student student = new Student(2L, "Maggie");
+        Students students = Students.getInstance();
         Instructors intsructors = Instructors.getInstance();
-        Educator instructor = Educator.CHRIS;
+        Instructor instructor = intsructors.getArray().get(0);
 
-        double start = student.getTotalStudayTime();
+        double start = students.getArray().get(0).getTotalStudayTime();
         zip.hostLecture(instructor,78.0);
-        double end = student.getTotalStudayTime();
+        double end = students.getArray().get(0).getTotalStudayTime();
         double expected =  2;
         double actual = end-start;