Merge branch 'develop' into develop

Author: bowbahdoe

src/SUMMARY.md

@@ -471,6 +471,7 @@
   - [Challenges](./files/challenges.md)
 
 
+
 <!--
 # Data Structures & Algorithms II
 
@@ -650,9 +651,12 @@ Make them do one. -->
 
 
 
+# Concepts
+
 
 # Concepts
 
+
 - [The Idiot Game](./the_idiot_game.md)
 
 # Data Types V
@@ -695,8 +699,6 @@ Make them do one. -->
 - [Sets]()
   - [HashSet]()
 
-
-
 <!--
 
   

src/arrays_ii/initialization_with_size.md

@@ -13,4 +13,5 @@ boolean[] pixels = new boolean[23040];
 
 So you have to say `new` followed by the type of element in the array, `[`, the size of the array and `]`.
 
-[^bw]: The original GameBoy wasn't actually just black and white. It supported 7 shades of gray, so a `boolean` wouldn't technically to be enough to represent a pixel's state. You'd have to use something with at least 8 states, not just 2.
+
+[^bw]: The original GameBoy wasn't actually just black and white. It supported 7 shades of gray, so a `boolean` wouldn't technically to be enough to represent a pixel's state. You'd have to use something with at least 8 states, not just 2.

src/boolean/operator_precedence.md

@@ -9,7 +9,7 @@ For booleans `!` always happens first. This is followed by `&&` and then by `||`
 
 ```java,no_run
 boolean a = true;
-boolean b = false
+boolean b = false;
 boolean c = false;
 
 // just as 2 + 5 * 3 "evaluates" 5 * 3 before adding 2

src/branching_logic/challenges.md

@@ -41,8 +41,8 @@ void main() {
 
 ## Challenge 4
 
-Write code that will assign the string `The number is {x} even` to `message` if `x` is an even number
-and `The number is {x} odd` if `x` is an odd number.
+Write code that will assign the string `The number {x} is even` to `message` if `x` is an even number
+and `The number {x} is odd` if `x` is an odd number.
 
 So if `x` is 12 the string you should assign `The number 12 is even` to `message`.
 

src/encapsulation.md

@@ -5,4 +5,5 @@ is encapsulation.
 
 To encapsulate something is to hide it from the larger world. By doing
 so you lower the number of people who are able to observe what we would call
-"implementation details."
+"implementation details."
+

src/generics.md

@@ -11,4 +11,5 @@ Generics help us make these generically useful containers.
 class Box<T> {
     T value;
 }
-```
+```
+

src/getting_started.md

@@ -37,6 +37,7 @@ You can either download the `.tar.gz` file that matches your machine, extract it
 and add the `bin` folder to your `PATH`, or you can try to find an installer for your
 specific linux distribution.
 
+
 ## repl.it
 
 [replit.com](https://replit.com) is a pretty common choice for teachers because

src/interfaces.md

@@ -11,4 +11,4 @@ of commonalities.
 inteface Dog {
     void bark();
 }
-```
+```

src/multi_dimensional_arrays.md

@@ -17,4 +17,4 @@ class Main {
         }
     }
 }
-```
+```

src/objects/override_equals_and_hashCode.md

@@ -1,5 +1,6 @@
 # Override equals and hashCode
 
+
 If you want to customize the `equals` method of an object the
 general pattern for doing so is the following.