Merge branch 'master' into '20-hurl-selected-thoughts'

# Conflicts:
#   src/sample/sample.fxml

src/sample/sample.fxml

@@ -2,7 +2,6 @@
 
 <?import javafx.scene.control.Button?>
 <?import javafx.scene.control.ListView?>
-<?import javafx.scene.control.ScrollPane?>
 <?import javafx.scene.control.TextArea?>
 <?import javafx.scene.layout.AnchorPane?>
 <?import javafx.scene.text.Font?>
@@ -10,26 +9,12 @@
 
 <AnchorPane id="hurlAllThoughts" maxHeight="-Infinity" maxWidth="-Infinity" minHeight="-Infinity" minWidth="-Infinity" prefHeight="498.0" prefWidth="700.0" xmlns="http://javafx.com/javafx/11.0.1" xmlns:fx="http://javafx.com/fxml/1" fx:controller="sample.Controller">
    <children>
-      <Button id="submitButton" layoutX="83.0" layoutY="432.0" mnemonicParsing="false" onAction="#handleSubmit" prefHeight="35.0" prefWidth="129.0" text="Submit thought" />
-      <TextArea id="textBox" fx:id="textArea" layoutX="58.0" layoutY="316.0" prefHeight="106.0" prefWidth="307.0" promptText="Write your thought here..." />
+      <Button id="submitButton" layoutX="85.0" layoutY="430.0" mnemonicParsing="false" onAction="#handleSubmit" prefHeight="35.0" prefWidth="129.0" text="Submit thought" />
+      <TextArea id="textBox" fx:id="textArea" layoutX="55.0" layoutY="315.0" prefHeight="106.0" prefWidth="307.0" promptText="Write your thought here..." />
       <Text id="thoughtField" fill="#b08686" layoutX="40.0" layoutY="32.0" strokeType="OUTSIDE" strokeWidth="0.0" text="Your Thoughts">
          <font>
             <Font size="17.0" />
          </font></Text>
-      <ScrollPane id="scrollyboi" layoutY="43.0" prefHeight="241.0" prefWidth="700.0">
-        <content>
-          <AnchorPane minHeight="0.0" minWidth="0.0" prefHeight="256.0" prefWidth="701.0">
-               <children>
-                  <Text id="thoughtId" fill="#755252" layoutX="37.0" layoutY="36.0" strokeType="OUTSIDE" strokeWidth="20.0" text="Text" wrappingWidth="500">
-                     <font>
-                        <Font size="14.0" />
-                     </font>
-                  </Text>
-                  <ListView fx:id="listView" layoutX="37.0" layoutY="14.0" prefHeight="200.0" prefWidth="585.0" />
-               </children>
-            </AnchorPane>
-        </content>
-      </ScrollPane>
       <Button layoutX="531.0" layoutY="10.0" mnemonicParsing="false" onAction="#handleHurlAll" text="Hurl all your thoughts" />
       <Button layoutX="365.0" layoutY="10.0" mnemonicParsing="false" onAction="#handleHurlSelected" text="Hurl selected thoughts" />
    </children>