merge with upstream

Author: jamesrcounts

.gitignore

@@ -10,3 +10,5 @@
 settings.xml
 /.idea
 TeachingKidsProgramming.Source.Java.iml
+
+*.orig

src/main/java/org/teachingextensions/logo/TurtlePanel.java

@@ -85,9 +85,10 @@ public synchronized Animals getAnimal()
   public synchronized void setAnimal(Animals animal)
   {
     this.animal = animal;
-    URL resource = this.getClass().getClassLoader()
-			.getResource("images/" + animal + ".png");
-	image = new ImageIcon(resource).getImage();
+    String name = "images/" + animal + ".png";
+	URL resource = this.getClass().getClassLoader().getResource(name);
+    if (resource == null) { throw new IllegalStateException("Could not find animal: " + name); }
+    image = new ImageIcon(resource).getImage();
   }
   public void setCursor(int cursor)
   {

src/main/java/org/teachingkidsprogramming/recipes/quizzes/graders/QuizBuzzAdapter.java

@@ -9,10 +9,10 @@ public static void main(String[] args)
     //    Add Blue Violet to the Color Wheel (HINT: Use PenColors)--#7
     //    Add Violet to the Color Wheel --#8
     //    Add Purple to the Color Wheel --#9
-    //    Do the following 75 times --#3
+    //    Do the following 75 times --#3.1
     //         Change the pen color of the line the tortoise draws the next color on the Color Wheel --#6
     //         Move the tortoise 5 times the current line number you are drawing --#5
     //         Turn the tortoise 1/3 of 360 degrees to the right --#2
-    //  Repeat --#3
+    //    Repeat --#3.2
   }
 }

src/main/java/org/teachingkidsprogramming/recipes/quizzes/graders/QuizBuzzGrader.java

@@ -6,17 +6,17 @@ public static void main(String[] args)
   {
     //  Show the tortoise --#1
     //  Make the tortoise move as fast as possible --#7
-    //  Do the following 4 times --#8
-    //      drawSquare (recipe below) --#6
-    //      ------------- Recipe for drawSquare --#6
-    //      Do the following 4 times --#5
+    //  Do the following 4 times --#8.1
+    //      drawSquare (recipe below) --#6.1
+    //      ------------- Recipe for drawSquare --#6.2
+    //      Do the following 4 times --#5.1
     //          Change the pen color of the line the tortoise draws to a random color --#3
     //          Move the tortoise 50 pixels --#2
     //          Turn the tortoise 90 degrees to the right --#4
-    //      Repeat --#5
-    //      ------------- End of drawSquare recipe --#6
+    //      Repeat --#5.2
+    //      ------------- End of drawSquare recipe --#6.3
     //      Turn the tortoise 90 degrees to the right --#9
-    //  Repeat --#8
+    //  Repeat --#8.2
   }
   // Related Videos:
   // Sub recipe-> Method : http://youtu.be/C6fnqjceVcs

src/main/java/org/teachingkidsprogramming/section01forloops/Spiral.java

@@ -7,18 +7,18 @@ public static void main(String[] args)
     //   Make the tortoise move as fast as possible --#11
     //   Have the tortoise start at 200 pixels in on the X axis --#14
     //   The current height is 40 --#1.2
-    //   drawHouse (recipe below) --#9
-    //   ------------- Recipe for drawHouse --#9
-    //   Change the pen color of the line the tortoise draws to lightGray --#15
-    //   Move the tortoise the height of a house --#1.1
-    //   Turn the tortoise 90 degrees to the right --#2
-    //   Move the tortoise 30 pixels --#3
-    //   Turn the tortoise 90 degrees to the right --#4
-    //   Move the tortoise the height of a house --#5
-    //   Turn the tortoise 90 degrees to the left --#6
-    //   Move the tortoise 20 pixels --#7
-    //   Turn the tortoise 90 degrees to the left --#8
-    //   ------------- End of drawHouse recipe --#9
+    //   drawHouse (recipe below) --#9.1
+    //   ------------- Recipe for drawHouse --#9.2
+    //       Change the pen color of the line the tortoise draws to lightGray --#15
+    //       Move the tortoise the height of a house --#1.1
+    //       Turn the tortoise 90 degrees to the right --#2
+    //       Move the tortoise 30 pixels --#3
+    //       Turn the tortoise 90 degrees to the right --#4
+    //       Move the tortoise the height of a house --#5
+    //       Turn the tortoise 90 degrees to the left --#6
+    //       Move the tortoise 20 pixels --#7
+    //       Turn the tortoise 90 degrees to the left --#8
+    //   ------------- End of drawHouse recipe --#9.3
     //   drawHouse with height 120 (recipe below) --#10
     //   drawHouse with height 90 (recipe below) --#12
     //   drawHouse with height 20 (recipe below) --#13

src/main/java/org/teachingkidsprogramming/section02methods/FourSquare.java

@@ -6,19 +6,21 @@ public class TriangleShell
   public static void main(String[] args)
   {
     //    Show the tortoise --#1
-    //    Make the tortoise go as fast as possible --#7
-    //    Do the following 60 times --#8.1
-    //          Change the pen color of the line the tortoise draws to a random color --#10
-    //          Increase the current length of the side by 4 pixels --#9
-    //          drawTriangle (recipe below) --#6
-    //          ------------- Recipe for drawTriangle --#5
+    //    Make the tortoise go as fast as possible --#6
+    //    Do the following 60 times --#7.1
+    //          Change the pen color of the line the tortoise draws to a random color --#9
+    //          Increase the current length of the side by 4 pixels --#8
+    //
+    //          drawTriangle (recipe below) --#5.1
+    //          ------------- Recipe for drawTriangle --#5.2
     //              Do the following 3 times --#3.1
     //                      Move the tortoise the current length of a side --#4
     //                      Turn the tortoise 1/3rd of 360 degrees --#2
     //              Repeat --#3.2 
-    //          ------------- End of drawTriangle recipe --#5
-    //          Turn the tortoise 1/60th of 360 degrees to the right --#11
-    //    Repeat --#8.2
+    //          ------------- End of drawTriangle recipe --#5.3
+    //
+    //          Turn the tortoise 1/60th of 360 degrees to the right --#10
+    //    Repeat --#7.2
   }
   // Related Videos:
   // Sub recipe-> Method : http://youtu.be/C6fnqjceVcs