From fe0f44dd31f99df0c7cadb22bf79671b795e974f Mon Sep 17 00:00:00 2001
From: Carly Langlois <cj.langlois.cl@gmail.com>
Date: Wed, 30 Oct 2019 10:06:35 -0500
Subject: [PATCH 1/8] add cat and housecat classes, patch student class so
 build error doesnt distract

---
 .../java/demos/inheritance/Cat.java           | 72 +++++++++++++++++++
 .../java/demos/inheritance/HouseCat.java      | 41 +++++++++++
 .../java/demos/lsn4school/Student.java        |  2 +
 3 files changed, 115 insertions(+)
 create mode 100644 src/org/launchcode/java/demos/inheritance/Cat.java
 create mode 100644 src/org/launchcode/java/demos/inheritance/HouseCat.java

diff --git a/src/org/launchcode/java/demos/inheritance/Cat.java b/src/org/launchcode/java/demos/inheritance/Cat.java
new file mode 100644
index 000000000..753bcf862
--- /dev/null
+++ b/src/org/launchcode/java/demos/inheritance/Cat.java
@@ -0,0 +1,72 @@
+package org.launchcode.java.demos.inheritance;
+
+public abstract class Cat {
+
+    private boolean tired = false;
+    private boolean hungry = false;
+    private double weight;
+
+    // The biological family for all cat species
+    private String family = "Felidae";
+
+    public Cat (double aWeight) {
+        weight = aWeight;
+    }
+
+    public Cat () {
+        weight = 13;
+    }
+
+    /**** Getters and Setters ****/
+
+    public boolean isTired() {
+        return tired;
+    }
+
+    public void setTired(boolean aTired) {
+        tired = aTired;
+    }
+
+    public boolean isHungry() {
+        return hungry;
+    }
+
+    public void setHungry(boolean aHungry) {
+        hungry = aHungry;
+    }
+
+    public double getWeight() {
+        return weight;
+    }
+
+    public void setWeight(double aWeight) {
+        weight = aWeight;
+    }
+
+    public String getFamily() {
+        return family;
+    }
+
+    /**** Instance Methods ****/
+
+    // A cat is rested and hungry after it sleeps
+    public void sleep() {
+        tired = false;
+        hungry = true;
+    }
+
+    // Eating makes a cat not hungry
+    public void eat() {
+
+        // eating when not hungry makes a cat sleepy
+        if (!hungry) {
+            tired = true;
+        }
+
+        hungry = false;
+    }
+
+    public String noise () {
+        return "Meeeeeeooooowww!";
+    }
+}
diff --git a/src/org/launchcode/java/demos/inheritance/HouseCat.java b/src/org/launchcode/java/demos/inheritance/HouseCat.java
new file mode 100644
index 000000000..12f203138
--- /dev/null
+++ b/src/org/launchcode/java/demos/inheritance/HouseCat.java
@@ -0,0 +1,41 @@
+package org.launchcode.java.demos.inheritance;
+
+public class HouseCat extends Cat {
+    private String name;
+    private String species = "Felis catus";
+
+    public HouseCat(String aName, double aWeight) {
+        super(aWeight);
+        name = aName;
+    }
+
+    public HouseCat(String aName) {
+        name = aName;
+    }
+
+    public HouseCat(double aWeight) {
+        super(aWeight);
+    }
+
+    public boolean isSatisfied() {
+        return !isHungry() && !isTired();
+    }
+
+//    @Override
+//    public String noise() {
+//        return "Hello, my name is " + name + "!";
+//    }
+
+    @Override
+    public String noise() {
+        if (isSatisfied()) {
+            return "Hello, my name is " + name + "!";
+        } else {
+            return super.noise(); // prints "Meeeeeeooooowww!"
+        }
+    }
+
+    public String purr() {
+        return "I'm a HouseCat";
+    }
+}
diff --git a/src/org/launchcode/java/demos/lsn4school/Student.java b/src/org/launchcode/java/demos/lsn4school/Student.java
index 071ad1287..bcb04237f 100644
--- a/src/org/launchcode/java/demos/lsn4school/Student.java
+++ b/src/org/launchcode/java/demos/lsn4school/Student.java
@@ -31,6 +31,8 @@ public String studentInfo() {
     // TODO: Complete the getGradeLevel method here:
     public String getGradeLevel() {
         // Determine the grade level of the student based on numberOfCredits
+        // replace this return statement
+        return "";
     }
 
     // TODO: Complete the addGrade method.

From b4c59d866fe979d878decd3d73862f359a6b23d5 Mon Sep 17 00:00:00 2001
From: Carly Langlois <cj.langlois.cl@gmail.com>
Date: Wed, 30 Oct 2019 10:13:48 -0500
Subject: [PATCH 2/8] oops changed comment spacing

---
 src/org/launchcode/java/demos/lsn4school/Student.java | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/src/org/launchcode/java/demos/lsn4school/Student.java b/src/org/launchcode/java/demos/lsn4school/Student.java
index 289030956..e67e1a649 100644
--- a/src/org/launchcode/java/demos/lsn4school/Student.java
+++ b/src/org/launchcode/java/demos/lsn4school/Student.java
@@ -29,10 +29,10 @@ public String studentInfo() {
     }
 
 
-    // TODO: Uncomment and complete the getGradeLevel method here:
-    //    public String getGradeLevel() {
-    //        // Determine the grade level of the student based on numberOfCredits
-    //    }
+     //TODO: Uncomment and complete the getGradeLevel method here:
+//    public String getGradeLevel() {
+//        // Determine the grade level of the student based on numberOfCredits
+//    }
 
     // TODO: Complete the addGrade method.
     public void addGrade(int courseCredits, double grade) {

From 8056ed0559ce9fd200b13a0b7d22ceb023be4654 Mon Sep 17 00:00:00 2001
From: Carly Langlois <cj.langlois.cl@gmail.com>
Date: Fri, 1 Nov 2019 10:29:34 -0500
Subject: [PATCH 3/8] starter code for lsn6 in-book demos

---
 .../java/demos/inheritance/Cat.java           |  6 +-----
 .../java/demos/inheritance/HouseCat.java      | 19 +------------------
 2 files changed, 2 insertions(+), 23 deletions(-)

diff --git a/src/org/launchcode/java/demos/inheritance/Cat.java b/src/org/launchcode/java/demos/inheritance/Cat.java
index 753bcf862..9e4d2e26c 100644
--- a/src/org/launchcode/java/demos/inheritance/Cat.java
+++ b/src/org/launchcode/java/demos/inheritance/Cat.java
@@ -1,6 +1,6 @@
 package org.launchcode.java.demos.inheritance;
 
-public abstract class Cat {
+public class Cat {
 
     private boolean tired = false;
     private boolean hungry = false;
@@ -13,10 +13,6 @@ public Cat (double aWeight) {
         weight = aWeight;
     }
 
-    public Cat () {
-        weight = 13;
-    }
-
     /**** Getters and Setters ****/
 
     public boolean isTired() {
diff --git a/src/org/launchcode/java/demos/inheritance/HouseCat.java b/src/org/launchcode/java/demos/inheritance/HouseCat.java
index 12f203138..fc0ea053b 100644
--- a/src/org/launchcode/java/demos/inheritance/HouseCat.java
+++ b/src/org/launchcode/java/demos/inheritance/HouseCat.java
@@ -9,30 +9,13 @@ public HouseCat(String aName, double aWeight) {
         name = aName;
     }
 
-    public HouseCat(String aName) {
-        name = aName;
-    }
-
-    public HouseCat(double aWeight) {
-        super(aWeight);
-    }
-
     public boolean isSatisfied() {
         return !isHungry() && !isTired();
     }
 
-//    @Override
-//    public String noise() {
-//        return "Hello, my name is " + name + "!";
-//    }
-
     @Override
     public String noise() {
-        if (isSatisfied()) {
-            return "Hello, my name is " + name + "!";
-        } else {
-            return super.noise(); // prints "Meeeeeeooooowww!"
-        }
+        return "Hello, my name is " + name + "!";
     }
 
     public String purr() {

From 5e91bc2b3ce5e501dce174c9e18021243fad4511 Mon Sep 17 00:00:00 2001
From: Carly Langlois <cj.langlois.cl@gmail.com>
Date: Fri, 1 Nov 2019 10:41:50 -0500
Subject: [PATCH 4/8] standardize demo package names,

---
 .../java/demos/{datatypes => lsn1datatypes}/HelloMethods.java   | 2 +-
 .../java/demos/{datatypes => lsn1datatypes}/Message.java        | 2 +-
 .../java/demos/{datatypes => lsn1datatypes}/TempConverter.java  | 2 +-
 .../demos/{collections => lsn2collections}/ArrayGradebook.java  | 2 +-
 .../{collections => lsn2collections}/ArrayListGradebook.java    | 2 +-
 .../{collections => lsn2collections}/HashMapGradebook.java      | 2 +-
 .../java/demos/{school => lsn3classes1}/SchoolPractice.java     | 2 +-
 .../launchcode/java/demos/{school => lsn3classes1}/Student.java | 2 +-
 .../java/demos/{lsn4school => lsn4classes2}/Course.java         | 2 +-
 .../java/demos/{lsn4school => lsn4classes2}/Student.java        | 2 +-
 .../java/demos/{lsn4school => lsn4classes2}/Teacher.java        | 2 +-
 .../java/demos/{testing => lsn5unittesting}/main/Car.java       | 2 +-
 .../java/demos/{testing => lsn5unittesting}/main/Main.java      | 2 +-
 .../java/demos/{testing => lsn5unittesting}/test/CarTest.java   | 2 +-
 .../java/demos/{inheritance => lsn6inheritance}/Cat.java        | 2 +-
 .../java/demos/{inheritance => lsn6inheritance}/HouseCat.java   | 2 +-
 16 files changed, 16 insertions(+), 16 deletions(-)
 rename src/org/launchcode/java/demos/{datatypes => lsn1datatypes}/HelloMethods.java (77%)
 rename src/org/launchcode/java/demos/{datatypes => lsn1datatypes}/Message.java (85%)
 rename src/org/launchcode/java/demos/{datatypes => lsn1datatypes}/TempConverter.java (90%)
 rename src/org/launchcode/java/demos/{collections => lsn2collections}/ArrayGradebook.java (96%)
 rename src/org/launchcode/java/demos/{collections => lsn2collections}/ArrayListGradebook.java (96%)
 rename src/org/launchcode/java/demos/{collections => lsn2collections}/HashMapGradebook.java (96%)
 rename src/org/launchcode/java/demos/{school => lsn3classes1}/SchoolPractice.java (74%)
 rename src/org/launchcode/java/demos/{school => lsn3classes1}/Student.java (85%)
 rename src/org/launchcode/java/demos/{lsn4school => lsn4classes2}/Course.java (90%)
 rename src/org/launchcode/java/demos/{lsn4school => lsn4classes2}/Student.java (97%)
 rename src/org/launchcode/java/demos/{lsn4school => lsn4classes2}/Teacher.java (95%)
 rename src/org/launchcode/java/demos/{testing => lsn5unittesting}/main/Car.java (97%)
 rename src/org/launchcode/java/demos/{testing => lsn5unittesting}/main/Main.java (77%)
 rename src/org/launchcode/java/demos/{testing => lsn5unittesting}/test/CarTest.java (88%)
 rename src/org/launchcode/java/demos/{inheritance => lsn6inheritance}/Cat.java (96%)
 rename src/org/launchcode/java/demos/{inheritance => lsn6inheritance}/HouseCat.java (90%)

diff --git a/src/org/launchcode/java/demos/datatypes/HelloMethods.java b/src/org/launchcode/java/demos/lsn1datatypes/HelloMethods.java
similarity index 77%
rename from src/org/launchcode/java/demos/datatypes/HelloMethods.java
rename to src/org/launchcode/java/demos/lsn1datatypes/HelloMethods.java
index 9457fe200..a375d208a 100644
--- a/src/org/launchcode/java/demos/datatypes/HelloMethods.java
+++ b/src/org/launchcode/java/demos/lsn1datatypes/HelloMethods.java
@@ -1,4 +1,4 @@
-package org.launchcode.java.demos.datatypes;
+package org.launchcode.java.demos.lsn1datatypes;
 
 public class HelloMethods {
 
diff --git a/src/org/launchcode/java/demos/datatypes/Message.java b/src/org/launchcode/java/demos/lsn1datatypes/Message.java
similarity index 85%
rename from src/org/launchcode/java/demos/datatypes/Message.java
rename to src/org/launchcode/java/demos/lsn1datatypes/Message.java
index 978ec3b5b..9d42bfa1b 100644
--- a/src/org/launchcode/java/demos/datatypes/Message.java
+++ b/src/org/launchcode/java/demos/lsn1datatypes/Message.java
@@ -1,4 +1,4 @@
-package org.launchcode.java.demos.datatypes;
+package org.launchcode.java.demos.lsn1datatypes;
 
 public class Message {
 
diff --git a/src/org/launchcode/java/demos/datatypes/TempConverter.java b/src/org/launchcode/java/demos/lsn1datatypes/TempConverter.java
similarity index 90%
rename from src/org/launchcode/java/demos/datatypes/TempConverter.java
rename to src/org/launchcode/java/demos/lsn1datatypes/TempConverter.java
index cc5b4cf6e..89d9fbc01 100644
--- a/src/org/launchcode/java/demos/datatypes/TempConverter.java
+++ b/src/org/launchcode/java/demos/lsn1datatypes/TempConverter.java
@@ -1,4 +1,4 @@
-package org.launchcode.java.demos.datatypes;
+package org.launchcode.java.demos.lsn1datatypes;
 
 import java.util.Scanner;
 
diff --git a/src/org/launchcode/java/demos/collections/ArrayGradebook.java b/src/org/launchcode/java/demos/lsn2collections/ArrayGradebook.java
similarity index 96%
rename from src/org/launchcode/java/demos/collections/ArrayGradebook.java
rename to src/org/launchcode/java/demos/lsn2collections/ArrayGradebook.java
index 943d4a525..bce310389 100644
--- a/src/org/launchcode/java/demos/collections/ArrayGradebook.java
+++ b/src/org/launchcode/java/demos/lsn2collections/ArrayGradebook.java
@@ -1,4 +1,4 @@
-package org.launchcode.java.demos.collections;
+package org.launchcode.java.demos.lsn2collections;
 
 import java.util.Scanner;
 
diff --git a/src/org/launchcode/java/demos/collections/ArrayListGradebook.java b/src/org/launchcode/java/demos/lsn2collections/ArrayListGradebook.java
similarity index 96%
rename from src/org/launchcode/java/demos/collections/ArrayListGradebook.java
rename to src/org/launchcode/java/demos/lsn2collections/ArrayListGradebook.java
index 9b49afae4..12887065b 100644
--- a/src/org/launchcode/java/demos/collections/ArrayListGradebook.java
+++ b/src/org/launchcode/java/demos/lsn2collections/ArrayListGradebook.java
@@ -1,4 +1,4 @@
-package org.launchcode.java.demos.collections;
+package org.launchcode.java.demos.lsn2collections;
 
 import java.util.ArrayList;
 import java.util.Scanner;
diff --git a/src/org/launchcode/java/demos/collections/HashMapGradebook.java b/src/org/launchcode/java/demos/lsn2collections/HashMapGradebook.java
similarity index 96%
rename from src/org/launchcode/java/demos/collections/HashMapGradebook.java
rename to src/org/launchcode/java/demos/lsn2collections/HashMapGradebook.java
index 717d4da9f..3d74342c4 100644
--- a/src/org/launchcode/java/demos/collections/HashMapGradebook.java
+++ b/src/org/launchcode/java/demos/lsn2collections/HashMapGradebook.java
@@ -1,4 +1,4 @@
-package org.launchcode.java.demos.collections;
+package org.launchcode.java.demos.lsn2collections;
 
 import java.util.HashMap;
 import java.util.Map;
diff --git a/src/org/launchcode/java/demos/school/SchoolPractice.java b/src/org/launchcode/java/demos/lsn3classes1/SchoolPractice.java
similarity index 74%
rename from src/org/launchcode/java/demos/school/SchoolPractice.java
rename to src/org/launchcode/java/demos/lsn3classes1/SchoolPractice.java
index e0fdf954e..7ea3d53ee 100644
--- a/src/org/launchcode/java/demos/school/SchoolPractice.java
+++ b/src/org/launchcode/java/demos/lsn3classes1/SchoolPractice.java
@@ -1,4 +1,4 @@
-package org.launchcode.java.demos.school;
+package org.launchcode.java.demos.lsn3classes1;
 
 public class SchoolPractice {
     public static void main(String[] args) {
diff --git a/src/org/launchcode/java/demos/school/Student.java b/src/org/launchcode/java/demos/lsn3classes1/Student.java
similarity index 85%
rename from src/org/launchcode/java/demos/school/Student.java
rename to src/org/launchcode/java/demos/lsn3classes1/Student.java
index 6fe5fcdcd..73f21c5fc 100644
--- a/src/org/launchcode/java/demos/school/Student.java
+++ b/src/org/launchcode/java/demos/lsn3classes1/Student.java
@@ -1,4 +1,4 @@
-package org.launchcode.java.demos.school;
+package org.launchcode.java.demos.lsn3classes1;
 
 // Start working here with your Student class.
 // To instantiate the Student class, add your code to the main in the file, SchoolPractice.
diff --git a/src/org/launchcode/java/demos/lsn4school/Course.java b/src/org/launchcode/java/demos/lsn4classes2/Course.java
similarity index 90%
rename from src/org/launchcode/java/demos/lsn4school/Course.java
rename to src/org/launchcode/java/demos/lsn4classes2/Course.java
index 9285997f6..cb04bc96a 100644
--- a/src/org/launchcode/java/demos/lsn4school/Course.java
+++ b/src/org/launchcode/java/demos/lsn4classes2/Course.java
@@ -1,4 +1,4 @@
-package org.launchcode.java.demos.lsn4school;
+package org.launchcode.java.demos.lsn4classes2;
 
 import java.util.ArrayList;
 
diff --git a/src/org/launchcode/java/demos/lsn4school/Student.java b/src/org/launchcode/java/demos/lsn4classes2/Student.java
similarity index 97%
rename from src/org/launchcode/java/demos/lsn4school/Student.java
rename to src/org/launchcode/java/demos/lsn4classes2/Student.java
index e67e1a649..b51eb666a 100644
--- a/src/org/launchcode/java/demos/lsn4school/Student.java
+++ b/src/org/launchcode/java/demos/lsn4classes2/Student.java
@@ -1,4 +1,4 @@
-package org.launchcode.java.demos.lsn4school;
+package org.launchcode.java.demos.lsn4classes2;
 
 public class Student {
 
diff --git a/src/org/launchcode/java/demos/lsn4school/Teacher.java b/src/org/launchcode/java/demos/lsn4classes2/Teacher.java
similarity index 95%
rename from src/org/launchcode/java/demos/lsn4school/Teacher.java
rename to src/org/launchcode/java/demos/lsn4classes2/Teacher.java
index 974e52119..dfac8dea4 100644
--- a/src/org/launchcode/java/demos/lsn4school/Teacher.java
+++ b/src/org/launchcode/java/demos/lsn4classes2/Teacher.java
@@ -1,4 +1,4 @@
-package org.launchcode.java.demos.lsn4school;
+package org.launchcode.java.demos.lsn4classes2;
 
 public class Teacher {
     private String firstName;
diff --git a/src/org/launchcode/java/demos/testing/main/Car.java b/src/org/launchcode/java/demos/lsn5unittesting/main/Car.java
similarity index 97%
rename from src/org/launchcode/java/demos/testing/main/Car.java
rename to src/org/launchcode/java/demos/lsn5unittesting/main/Car.java
index 81229839a..1fc03a6d6 100644
--- a/src/org/launchcode/java/demos/testing/main/Car.java
+++ b/src/org/launchcode/java/demos/lsn5unittesting/main/Car.java
@@ -1,4 +1,4 @@
-package org.launchcode.java.demos.testing.main;
+package org.launchcode.java.demos.lsn5unittesting.main;
 
 public class Car {
 
diff --git a/src/org/launchcode/java/demos/testing/main/Main.java b/src/org/launchcode/java/demos/lsn5unittesting/main/Main.java
similarity index 77%
rename from src/org/launchcode/java/demos/testing/main/Main.java
rename to src/org/launchcode/java/demos/lsn5unittesting/main/Main.java
index 523d40cfb..2d40a7423 100644
--- a/src/org/launchcode/java/demos/testing/main/Main.java
+++ b/src/org/launchcode/java/demos/lsn5unittesting/main/Main.java
@@ -1,4 +1,4 @@
-package org.launchcode.java.demos.testing.main;
+package org.launchcode.java.demos.lsn5unittesting.main;
 
 public class Main {
 
diff --git a/src/org/launchcode/java/demos/testing/test/CarTest.java b/src/org/launchcode/java/demos/lsn5unittesting/test/CarTest.java
similarity index 88%
rename from src/org/launchcode/java/demos/testing/test/CarTest.java
rename to src/org/launchcode/java/demos/lsn5unittesting/test/CarTest.java
index a3f5bcb96..7cde639dc 100644
--- a/src/org/launchcode/java/demos/testing/test/CarTest.java
+++ b/src/org/launchcode/java/demos/lsn5unittesting/test/CarTest.java
@@ -1,4 +1,4 @@
-package org.launchcode.java.demos.testing.test;
+package org.launchcode.java.demos.lsn5unittesting.test;
 
 public class CarTest {
 
diff --git a/src/org/launchcode/java/demos/inheritance/Cat.java b/src/org/launchcode/java/demos/lsn6inheritance/Cat.java
similarity index 96%
rename from src/org/launchcode/java/demos/inheritance/Cat.java
rename to src/org/launchcode/java/demos/lsn6inheritance/Cat.java
index 9e4d2e26c..48ff2ae96 100644
--- a/src/org/launchcode/java/demos/inheritance/Cat.java
+++ b/src/org/launchcode/java/demos/lsn6inheritance/Cat.java
@@ -1,4 +1,4 @@
-package org.launchcode.java.demos.inheritance;
+package org.launchcode.java.demos.lsn6inheritance;
 
 public class Cat {
 
diff --git a/src/org/launchcode/java/demos/inheritance/HouseCat.java b/src/org/launchcode/java/demos/lsn6inheritance/HouseCat.java
similarity index 90%
rename from src/org/launchcode/java/demos/inheritance/HouseCat.java
rename to src/org/launchcode/java/demos/lsn6inheritance/HouseCat.java
index fc0ea053b..aca82ffca 100644
--- a/src/org/launchcode/java/demos/inheritance/HouseCat.java
+++ b/src/org/launchcode/java/demos/lsn6inheritance/HouseCat.java
@@ -1,4 +1,4 @@
-package org.launchcode.java.demos.inheritance;
+package org.launchcode.java.demos.lsn6inheritance;
 
 public class HouseCat extends Cat {
     private String name;

From 13b9020d3e80c2ebbcaa1929374d0a02e4960b07 Mon Sep 17 00:00:00 2001
From: Carly Langlois <cj.langlois.cl@gmail.com>
Date: Fri, 1 Nov 2019 10:43:45 -0500
Subject: [PATCH 5/8] update gitignore to ignore .vscode/

---
 .gitignore | 1 +
 1 file changed, 1 insertion(+)

diff --git a/.gitignore b/.gitignore
index 7b8fe6935..2f8d1484e 100644
--- a/.gitignore
+++ b/.gitignore
@@ -126,3 +126,4 @@ $RECYCLE.BIN/
 # Windows shortcuts
 *.lnk
 
+.vscode/
\ No newline at end of file

From 1478589bc47d8d0942792da2f96afebca78e7499 Mon Sep 17 00:00:00 2001
From: Carly Langlois <cj.langlois.cl@gmail.com>
Date: Fri, 1 Nov 2019 10:46:38 -0500
Subject: [PATCH 6/8] remove vscode dir

---
 .vscode/settings.json | 8 --------
 1 file changed, 8 deletions(-)
 delete mode 100644 .vscode/settings.json

diff --git a/.vscode/settings.json b/.vscode/settings.json
deleted file mode 100644
index 2421e386c..000000000
--- a/.vscode/settings.json
+++ /dev/null
@@ -1,8 +0,0 @@
-{
-    "files.exclude": {
-        "**/.classpath": true,
-        "**/.project": true,
-        "**/.settings": true,
-        "**/.factorypath": true
-    }
-}
\ No newline at end of file

From 2e001bec91e07ec246d8e04c72dc375b9c612d54 Mon Sep 17 00:00:00 2001
From: Carly Langlois <cj.langlois.cl@gmail.com>
Date: Fri, 1 Nov 2019 13:37:02 -0500
Subject: [PATCH 7/8] add a readme

---
 README.md | 17 +++++++++++++++++
 1 file changed, 17 insertions(+)
 create mode 100644 README.md

diff --git a/README.md b/README.md
new file mode 100644
index 000000000..2442a6a74
--- /dev/null
+++ b/README.md
@@ -0,0 +1,17 @@
+# About this Repository
+
+This repo contains starter code for the in-book examples for LaunchCode's
+[Java Web Development](https://education.launchcode.org/java-web-development/index.html)
+course. 
+
+## Requirements
+
+The classes in this repo require Java13. Please refer to the book referenced
+above for instructions on how to download and use the examples.
+
+## Updating
+
+Occasionally, the LaunchCode team will make changes to this repository
+that will affect your coursework. When you start your prep-work for each
+lesson of the course, be sure to fetch to stay up to date with the 
+latest changes. 
\ No newline at end of file

From d22ffcc6d61d2390aa5f14c36c079cada9436777 Mon Sep 17 00:00:00 2001
From: Carly Langlois <cj.langlois.cl@gmail.com>
Date: Fri, 1 Nov 2019 14:58:07 -0500
Subject: [PATCH 8/8] change collections to controlflowandcollections

---
 .../ArrayGradebook.java                                         | 2 +-
 .../ArrayListGradebook.java                                     | 2 +-
 .../HashMapGradebook.java                                       | 2 +-
 3 files changed, 3 insertions(+), 3 deletions(-)
 rename src/org/launchcode/java/demos/{lsn2collections => lsn2controlflowandcollections}/ArrayGradebook.java (95%)
 rename src/org/launchcode/java/demos/{lsn2collections => lsn2controlflowandcollections}/ArrayListGradebook.java (94%)
 rename src/org/launchcode/java/demos/{lsn2collections => lsn2controlflowandcollections}/HashMapGradebook.java (95%)

diff --git a/src/org/launchcode/java/demos/lsn2collections/ArrayGradebook.java b/src/org/launchcode/java/demos/lsn2controlflowandcollections/ArrayGradebook.java
similarity index 95%
rename from src/org/launchcode/java/demos/lsn2collections/ArrayGradebook.java
rename to src/org/launchcode/java/demos/lsn2controlflowandcollections/ArrayGradebook.java
index bce310389..d60ac79bb 100644
--- a/src/org/launchcode/java/demos/lsn2collections/ArrayGradebook.java
+++ b/src/org/launchcode/java/demos/lsn2controlflowandcollections/ArrayGradebook.java
@@ -1,4 +1,4 @@
-package org.launchcode.java.demos.lsn2collections;
+package org.launchcode.java.demos.lsn2controlflowandcollections;
 
 import java.util.Scanner;
 
diff --git a/src/org/launchcode/java/demos/lsn2collections/ArrayListGradebook.java b/src/org/launchcode/java/demos/lsn2controlflowandcollections/ArrayListGradebook.java
similarity index 94%
rename from src/org/launchcode/java/demos/lsn2collections/ArrayListGradebook.java
rename to src/org/launchcode/java/demos/lsn2controlflowandcollections/ArrayListGradebook.java
index 12887065b..f4512f288 100644
--- a/src/org/launchcode/java/demos/lsn2collections/ArrayListGradebook.java
+++ b/src/org/launchcode/java/demos/lsn2controlflowandcollections/ArrayListGradebook.java
@@ -1,4 +1,4 @@
-package org.launchcode.java.demos.lsn2collections;
+package org.launchcode.java.demos.lsn2controlflowandcollections;
 
 import java.util.ArrayList;
 import java.util.Scanner;
diff --git a/src/org/launchcode/java/demos/lsn2collections/HashMapGradebook.java b/src/org/launchcode/java/demos/lsn2controlflowandcollections/HashMapGradebook.java
similarity index 95%
rename from src/org/launchcode/java/demos/lsn2collections/HashMapGradebook.java
rename to src/org/launchcode/java/demos/lsn2controlflowandcollections/HashMapGradebook.java
index 3d74342c4..3be5726b8 100644
--- a/src/org/launchcode/java/demos/lsn2collections/HashMapGradebook.java
+++ b/src/org/launchcode/java/demos/lsn2controlflowandcollections/HashMapGradebook.java
@@ -1,4 +1,4 @@
-package org.launchcode.java.demos.lsn2collections;
+package org.launchcode.java.demos.lsn2controlflowandcollections;
 
 import java.util.HashMap;
 import java.util.Map;