From d530f6c79aea99a8e5d1580903e0a0849815f2d9 Mon Sep 17 00:00:00 2001
From: maj83 <maj83@aber.ac.uk>
Date: Mon, 20 Apr 2020 18:20:03 +0100
Subject: [PATCH] Added method for checking answers

---
 .../Match the meaning/.idea/encodings.xml     |   4 +
 .../Match the meaning/.idea/libraries/lib.xml |  13 +
 .../Match the meaning/.idea/misc.xml          |   6 +
 .../Match the meaning/.idea/modules.xml       |   8 +
 .../Match the meaning/.idea/workspace.xml     | 413 ++++++++++++++++++
 .../Match the meaning/Match the meaning.iml   |  12 +
 .../Match the meaning/DictionaryEntry.class   | Bin 0 -> 1947 bytes
 .../production/Match the meaning/Main.class   | Bin 0 -> 1044 bytes
 .../Match the meaning/MatchTheMeaning.fxml    |  71 +++
 .../Match the meaning/MyController.class      | Bin 0 -> 4590 bytes
 .../src/DictionaryEntry.java                  |  64 +++
 .../Match the meaning/src/Main.java           |  23 +
 .../src/MatchTheMeaning.fxml                  |  71 +++
 .../Match the meaning/src/MyController.java   | 135 ++++++
 14 files changed, 820 insertions(+)
 create mode 100644 dev/20200414/maj83/Welsh Vocabulary Tutor/Match the meaning/.idea/encodings.xml
 create mode 100644 dev/20200414/maj83/Welsh Vocabulary Tutor/Match the meaning/.idea/libraries/lib.xml
 create mode 100644 dev/20200414/maj83/Welsh Vocabulary Tutor/Match the meaning/.idea/misc.xml
 create mode 100644 dev/20200414/maj83/Welsh Vocabulary Tutor/Match the meaning/.idea/modules.xml
 create mode 100644 dev/20200414/maj83/Welsh Vocabulary Tutor/Match the meaning/.idea/workspace.xml
 create mode 100644 dev/20200414/maj83/Welsh Vocabulary Tutor/Match the meaning/Match the meaning.iml
 create mode 100644 dev/20200414/maj83/Welsh Vocabulary Tutor/Match the meaning/out/production/Match the meaning/DictionaryEntry.class
 create mode 100644 dev/20200414/maj83/Welsh Vocabulary Tutor/Match the meaning/out/production/Match the meaning/Main.class
 create mode 100644 dev/20200414/maj83/Welsh Vocabulary Tutor/Match the meaning/out/production/Match the meaning/MatchTheMeaning.fxml
 create mode 100644 dev/20200414/maj83/Welsh Vocabulary Tutor/Match the meaning/out/production/Match the meaning/MyController.class
 create mode 100644 dev/20200414/maj83/Welsh Vocabulary Tutor/Match the meaning/src/DictionaryEntry.java
 create mode 100644 dev/20200414/maj83/Welsh Vocabulary Tutor/Match the meaning/src/Main.java
 create mode 100644 dev/20200414/maj83/Welsh Vocabulary Tutor/Match the meaning/src/MatchTheMeaning.fxml
 create mode 100644 dev/20200414/maj83/Welsh Vocabulary Tutor/Match the meaning/src/MyController.java

diff --git a/dev/20200414/maj83/Welsh Vocabulary Tutor/Match the meaning/.idea/encodings.xml b/dev/20200414/maj83/Welsh Vocabulary Tutor/Match the meaning/.idea/encodings.xml
new file mode 100644
index 0000000..15a15b2
--- /dev/null
+++ b/dev/20200414/maj83/Welsh Vocabulary Tutor/Match the meaning/.idea/encodings.xml	
@@ -0,0 +1,4 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<project version="4">
+  <component name="Encoding" addBOMForNewFiles="with NO BOM" />
+</project>
\ No newline at end of file
diff --git a/dev/20200414/maj83/Welsh Vocabulary Tutor/Match the meaning/.idea/libraries/lib.xml b/dev/20200414/maj83/Welsh Vocabulary Tutor/Match the meaning/.idea/libraries/lib.xml
new file mode 100644
index 0000000..a54ea18
--- /dev/null
+++ b/dev/20200414/maj83/Welsh Vocabulary Tutor/Match the meaning/.idea/libraries/lib.xml	
@@ -0,0 +1,13 @@
+<component name="libraryTable">
+  <library name="lib">
+    <CLASSES>
+      <root url="file://$PROJECT_DIR$/../javafx-sdk-14/lib" />
+    </CLASSES>
+    <JAVADOC />
+    <SOURCES>
+      <root url="file://$PROJECT_DIR$/../javafx-sdk-14/lib" />
+    </SOURCES>
+    <jarDirectory url="file://$PROJECT_DIR$/../javafx-sdk-14/lib" recursive="false" />
+    <jarDirectory url="file://$PROJECT_DIR$/../javafx-sdk-14/lib" recursive="false" type="SOURCES" />
+  </library>
+</component>
\ No newline at end of file
diff --git a/dev/20200414/maj83/Welsh Vocabulary Tutor/Match the meaning/.idea/misc.xml b/dev/20200414/maj83/Welsh Vocabulary Tutor/Match the meaning/.idea/misc.xml
new file mode 100644
index 0000000..e0844bc
--- /dev/null
+++ b/dev/20200414/maj83/Welsh Vocabulary Tutor/Match the meaning/.idea/misc.xml	
@@ -0,0 +1,6 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<project version="4">
+  <component name="ProjectRootManager" version="2" languageLevel="JDK_11" default="true" project-jdk-name="11" project-jdk-type="JavaSDK">
+    <output url="file://$PROJECT_DIR$/out" />
+  </component>
+</project>
\ No newline at end of file
diff --git a/dev/20200414/maj83/Welsh Vocabulary Tutor/Match the meaning/.idea/modules.xml b/dev/20200414/maj83/Welsh Vocabulary Tutor/Match the meaning/.idea/modules.xml
new file mode 100644
index 0000000..300bb9a
--- /dev/null
+++ b/dev/20200414/maj83/Welsh Vocabulary Tutor/Match the meaning/.idea/modules.xml	
@@ -0,0 +1,8 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<project version="4">
+  <component name="ProjectModuleManager">
+    <modules>
+      <module fileurl="file://$PROJECT_DIR$/Match the meaning.iml" filepath="$PROJECT_DIR$/Match the meaning.iml" />
+    </modules>
+  </component>
+</project>
\ No newline at end of file
diff --git a/dev/20200414/maj83/Welsh Vocabulary Tutor/Match the meaning/.idea/workspace.xml b/dev/20200414/maj83/Welsh Vocabulary Tutor/Match the meaning/.idea/workspace.xml
new file mode 100644
index 0000000..e80bc62
--- /dev/null
+++ b/dev/20200414/maj83/Welsh Vocabulary Tutor/Match the meaning/.idea/workspace.xml	
@@ -0,0 +1,413 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<project version="4">
+  <component name="ChangeListManager">
+    <list default="true" id="fbb2a4a0-47c2-4eac-8067-df2e585c83b3" name="Default Changelist" comment="" />
+    <ignored path="$PROJECT_DIR$/out/" />
+    <option name="EXCLUDED_CONVERTED_TO_IGNORED" value="true" />
+    <option name="SHOW_DIALOG" value="false" />
+    <option name="HIGHLIGHT_CONFLICTS" value="true" />
+    <option name="HIGHLIGHT_NON_ACTIVE_CHANGELIST" value="false" />
+    <option name="LAST_RESOLUTION" value="IGNORE" />
+  </component>
+  <component name="FileEditorManager">
+    <leaf SIDE_TABS_SIZE_LIMIT_KEY="300">
+      <file pinned="false" current-in-tab="false">
+        <entry file="file://$PROJECT_DIR$/src/Main.java">
+          <provider selected="true" editor-type-id="text-editor">
+            <state relative-caret-position="323">
+              <caret line="23" selection-start-line="23" selection-end-line="23" />
+              <folding>
+                <element signature="imports" expanded="true" />
+              </folding>
+            </state>
+          </provider>
+        </entry>
+      </file>
+      <file pinned="false" current-in-tab="true">
+        <entry file="file://$PROJECT_DIR$/src/MyController.java">
+          <provider selected="true" editor-type-id="text-editor">
+            <state relative-caret-position="416">
+              <caret line="114" selection-start-line="114" selection-end-line="114" />
+              <folding>
+                <element signature="imports" expanded="true" />
+              </folding>
+            </state>
+          </provider>
+        </entry>
+      </file>
+      <file pinned="false" current-in-tab="false">
+        <entry file="file://$PROJECT_DIR$/src/DictionaryEntry.java">
+          <provider selected="true" editor-type-id="text-editor">
+            <state relative-caret-position="357">
+              <caret line="27" selection-start-line="27" selection-end-line="27" />
+              <folding>
+                <element signature="e#684#685#0" expanded="true" />
+              </folding>
+            </state>
+          </provider>
+        </entry>
+      </file>
+      <file pinned="false" current-in-tab="false">
+        <entry file="file://$PROJECT_DIR$/src/MatchTheMeaning.fxml">
+          <provider editor-type-id="JavaFX-Scene-Builder" />
+          <provider selected="true" editor-type-id="text-editor">
+            <state relative-caret-position="275">
+              <caret line="55" column="86" lean-forward="true" selection-start-line="55" selection-start-column="86" selection-end-line="55" selection-end-column="86" />
+            </state>
+          </provider>
+        </entry>
+      </file>
+    </leaf>
+  </component>
+  <component name="FileTemplateManagerImpl">
+    <option name="RECENT_TEMPLATES">
+      <list>
+        <option value="Class" />
+      </list>
+    </option>
+  </component>
+  <component name="IdeDocumentHistory">
+    <option name="CHANGED_PATHS">
+      <list>
+        <option value="$PROJECT_DIR$/src/DictionaryEntry.java" />
+        <option value="$PROJECT_DIR$/src/Main.java" />
+        <option value="$PROJECT_DIR$/src/MyController.java" />
+        <option value="$PROJECT_DIR$/src/MatchTheMeaning.fxml" />
+      </list>
+    </option>
+  </component>
+  <component name="ProjectFrameBounds" extendedState="6">
+    <option name="x" value="-9" />
+    <option name="y" value="-9" />
+    <option name="width" value="1938" />
+    <option name="height" value="1058" />
+  </component>
+  <component name="ProjectView">
+    <navigator proportions="" version="1">
+      <foldersAlwaysOnTop value="true" />
+    </navigator>
+    <panes />
+  </component>
+  <component name="PropertiesComponent">
+    <property name="WebServerToolWindowFactoryState" value="false" />
+    <property name="aspect.path.notification.shown" value="true" />
+    <property name="com.android.tools.idea.instantapp.provision.ProvisionBeforeRunTaskProvider.myTimeStamp" value="1587042602227" />
+    <property name="last_opened_file_path" value="$PROJECT_DIR$/../javafx-sdk-14/lib" />
+    <property name="nodejs_interpreter_path.stuck_in_default_project" value="undefined stuck path" />
+    <property name="nodejs_npm_path_reset_for_default_project" value="true" />
+    <property name="project.structure.last.edited" value="Libraries" />
+    <property name="project.structure.proportion" value="0.15" />
+    <property name="project.structure.side.proportion" value="0.2" />
+  </component>
+  <component name="RunDashboard">
+    <option name="ruleStates">
+      <list>
+        <RuleState>
+          <option name="name" value="ConfigurationTypeDashboardGroupingRule" />
+        </RuleState>
+        <RuleState>
+          <option name="name" value="StatusDashboardGroupingRule" />
+        </RuleState>
+      </list>
+    </option>
+  </component>
+  <component name="RunManager">
+    <configuration name="Main" type="Application" factoryName="Application" temporary="true" nameIsGenerated="true">
+      <option name="MAIN_CLASS_NAME" value="Main" />
+      <module name="Match the meaning" />
+      <option name="VM_PARAMETERS" value="--module-path C:\Users\Marcin\Desktop\javafx-sdk-14\lib --add-modules javafx.controls,javafx.fxml" />
+      <method v="2">
+        <option name="Make" enabled="true" />
+      </method>
+    </configuration>
+    <recent_temporary>
+      <list>
+        <item itemvalue="Application.Main" />
+      </list>
+    </recent_temporary>
+  </component>
+  <component name="SvnConfiguration">
+    <configuration />
+  </component>
+  <component name="TaskManager">
+    <task active="true" id="Default" summary="Default task">
+      <changelist id="fbb2a4a0-47c2-4eac-8067-df2e585c83b3" name="Default Changelist" comment="" />
+      <created>1586778885037</created>
+      <option name="number" value="Default" />
+      <option name="presentableId" value="Default" />
+      <updated>1586778885037</updated>
+      <workItem from="1586778888266" duration="4356000" />
+      <workItem from="1586790476649" duration="5671000" />
+      <workItem from="1586796522495" duration="9386000" />
+      <workItem from="1587035664037" duration="6621000" />
+      <workItem from="1587208556418" duration="3298000" />
+    </task>
+    <servers />
+  </component>
+  <component name="TimeTrackingManager">
+    <option name="totallyTimeSpent" value="29332000" />
+  </component>
+  <component name="ToolWindowManager">
+    <frame x="-8" y="-8" width="1936" height="1056" extended-state="6" />
+    <layout>
+      <window_info content_ui="combo" id="Project" order="0" weight="0.08848614" />
+      <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" />
+      <window_info id="UI Designer" order="4" />
+      <window_info id="Capture Tool" order="5" />
+      <window_info id="Favorites" order="6" side_tool="true" />
+      <window_info anchor="bottom" id="Message" order="0" />
+      <window_info anchor="bottom" id="Find" order="1" />
+      <window_info anchor="bottom" id="Run" order="2" weight="0.21776815" />
+      <window_info anchor="bottom" id="Debug" order="3" weight="0.3163597" />
+      <window_info anchor="bottom" id="Cvs" order="4" weight="0.25" />
+      <window_info anchor="bottom" id="Inspection" order="5" weight="0.4" />
+      <window_info anchor="bottom" id="TODO" order="6" />
+      <window_info anchor="bottom" id="Docker" order="7" show_stripe_button="false" />
+      <window_info anchor="bottom" id="Version Control" order="8" />
+      <window_info anchor="bottom" id="Database Changes" order="9" />
+      <window_info anchor="bottom" id="Terminal" order="10" />
+      <window_info anchor="bottom" id="Event Log" order="11" side_tool="true" />
+      <window_info anchor="bottom" id="Messages" order="12" weight="0.32936078" />
+      <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" />
+      <window_info anchor="right" id="Palette" order="3" />
+      <window_info anchor="right" id="Database" order="4" />
+      <window_info anchor="right" id="Theme Preview" order="5" />
+      <window_info anchor="right" id="Maven" order="6" />
+      <window_info anchor="right" id="Capture Analysis" order="7" />
+      <window_info anchor="right" id="Palette&#9;" order="8" />
+    </layout>
+    <layout-to-restore>
+      <window_info content_ui="combo" id="Project" order="0" visible="true" weight="0.08848614" />
+      <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" />
+      <window_info id="UI Designer" order="4" />
+      <window_info id="Capture Tool" order="5" />
+      <window_info id="Favorites" order="6" side_tool="true" />
+      <window_info anchor="bottom" id="Message" order="0" />
+      <window_info anchor="bottom" id="Find" order="1" />
+      <window_info active="true" anchor="bottom" id="Run" order="2" visible="true" weight="0.21776815" />
+      <window_info anchor="bottom" id="Debug" order="3" weight="0.4" />
+      <window_info anchor="bottom" id="Cvs" order="4" weight="0.25" />
+      <window_info anchor="bottom" id="Inspection" order="5" weight="0.4" />
+      <window_info anchor="bottom" id="TODO" order="6" />
+      <window_info anchor="bottom" id="Docker" order="7" show_stripe_button="false" />
+      <window_info anchor="bottom" id="Version Control" order="8" />
+      <window_info anchor="bottom" id="Database Changes" order="9" />
+      <window_info anchor="bottom" id="Terminal" order="10" />
+      <window_info anchor="bottom" id="Event Log" order="11" side_tool="true" />
+      <window_info anchor="bottom" id="Messages" order="12" weight="0.32936078" />
+      <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" />
+      <window_info anchor="right" id="Palette" order="3" />
+      <window_info anchor="right" id="Database" order="4" />
+      <window_info anchor="right" id="Theme Preview" order="5" />
+      <window_info anchor="right" id="Maven" order="6" />
+      <window_info anchor="right" id="Capture Analysis" order="7" />
+      <window_info anchor="right" id="Palette&#9;" order="8" />
+    </layout-to-restore>
+  </component>
+  <component name="TypeScriptGeneratedFilesManager">
+    <option name="version" value="1" />
+  </component>
+  <component name="XDebuggerManager">
+    <breakpoint-manager>
+      <breakpoints>
+        <line-breakpoint enabled="true" type="java-line">
+          <url>file://$PROJECT_DIR$/src/MyController.java</url>
+          <line>108</line>
+          <properties />
+          <option name="timeStamp" value="11" />
+        </line-breakpoint>
+      </breakpoints>
+    </breakpoint-manager>
+  </component>
+  <component name="editorHistoryManager">
+    <entry file="file://$PROJECT_DIR$/out/production/Match the meaning/DictionaryEntry.class">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="306">
+          <caret line="19" lean-forward="true" selection-start-line="19" selection-end-line="19" />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/Main.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="323">
+          <caret line="23" selection-start-line="23" selection-end-line="23" />
+          <folding>
+            <element signature="imports" expanded="true" />
+          </folding>
+        </state>
+      </provider>
+    </entry>
+    <entry file="jar://$PROJECT_DIR$/../javafx-sdk-14/lib/javafx.controls.jar!/javafx/scene/control/ComboBoxBase.class">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="213">
+          <caret line="135" selection-start-line="135" selection-end-line="135" />
+          <folding>
+            <element signature="e#4575#4576#0" expanded="true" />
+            <element signature="e#4608#4609#0" expanded="true" />
+            <element signature="e#4778#4779#0" expanded="true" />
+          </folding>
+        </state>
+      </provider>
+    </entry>
+    <entry file="jar://$PROJECT_DIR$/../javafx-sdk-14/lib/javafx.base.jar!/javafx/beans/property/DoublePropertyBase.class">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="180">
+          <caret line="70" selection-start-line="70" selection-end-line="70" />
+        </state>
+      </provider>
+    </entry>
+    <entry file="jar://$PROJECT_DIR$/../javafx-sdk-14/lib/javafx.graphics.jar!/javafx/stage/Window.class">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="163">
+          <caret line="435" selection-start-line="435" selection-end-line="435" />
+        </state>
+      </provider>
+    </entry>
+    <entry file="jar://$PROJECT_DIR$/../javafx-sdk-14/lib/javafx.fxml.jar!/javafx/fxml/FXMLLoader.class">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="197">
+          <caret line="2424" selection-start-line="2424" selection-end-line="2424" />
+        </state>
+      </provider>
+    </entry>
+    <entry file="jar://$PROJECT_DIR$/../javafx-sdk-14/lib/javafx.controls.jar!/javafx/scene/control/Labeled.class">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="202">
+          <caret line="91" selection-start-line="91" selection-end-line="91" />
+          <folding>
+            <element signature="e#3123#3124#0" expanded="true" />
+          </folding>
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/MatchTheMeaning.fxml">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="275">
+          <caret line="55" column="86" lean-forward="true" selection-start-line="55" selection-start-column="86" selection-end-line="55" selection-end-column="86" />
+        </state>
+      </provider>
+      <provider editor-type-id="JavaFX-Scene-Builder" />
+    </entry>
+    <entry file="jar://$PROJECT_DIR$/../javafx-sdk-14/lib/javafx.base.jar!/javafx/beans/binding/StringExpression.class">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="187">
+          <caret line="16" selection-start-line="16" selection-end-line="16" />
+          <folding>
+            <element signature="e#460#461#0" expanded="true" />
+          </folding>
+        </state>
+      </provider>
+    </entry>
+    <entry file="jar://$PROJECT_DIR$/../javafx-sdk-14/lib/javafx.base.jar!/javafx/beans/property/StringPropertyBase.class">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="219">
+          <caret line="63" selection-start-line="63" selection-end-line="63" />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/DictionaryEntry.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="357">
+          <caret line="27" selection-start-line="27" selection-end-line="27" />
+          <folding>
+            <element signature="e#684#685#0" expanded="true" />
+          </folding>
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/MyController.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="416">
+          <caret line="114" selection-start-line="114" selection-end-line="114" />
+          <folding>
+            <element signature="imports" expanded="true" />
+          </folding>
+        </state>
+      </provider>
+    </entry>
+  </component>
+  <component name="masterDetails">
+    <states>
+      <state key="ArtifactsStructureConfigurable.UI">
+        <settings>
+          <artifact-editor />
+          <splitter-proportions>
+            <option name="proportions">
+              <list>
+                <option value="0.2" />
+              </list>
+            </option>
+          </splitter-proportions>
+        </settings>
+      </state>
+      <state key="FacetStructureConfigurable.UI">
+        <settings>
+          <last-edited>No facets are configured</last-edited>
+          <splitter-proportions>
+            <option name="proportions">
+              <list>
+                <option value="0.2" />
+              </list>
+            </option>
+          </splitter-proportions>
+        </settings>
+      </state>
+      <state key="GlobalLibrariesConfigurable.UI">
+        <settings>
+          <splitter-proportions>
+            <option name="proportions">
+              <list>
+                <option value="0.2" />
+              </list>
+            </option>
+          </splitter-proportions>
+        </settings>
+      </state>
+      <state key="JdkListConfigurable.UI">
+        <settings>
+          <last-edited>11</last-edited>
+          <splitter-proportions>
+            <option name="proportions">
+              <list>
+                <option value="0.2" />
+              </list>
+            </option>
+          </splitter-proportions>
+        </settings>
+      </state>
+      <state key="ModuleStructureConfigurable.UI">
+        <settings>
+          <last-edited>Match the meaning</last-edited>
+          <splitter-proportions>
+            <option name="proportions">
+              <list>
+                <option value="0.2" />
+                <option value="0.6" />
+              </list>
+            </option>
+          </splitter-proportions>
+        </settings>
+      </state>
+      <state key="ProjectLibrariesConfigurable.UI">
+        <settings>
+          <last-edited>lib</last-edited>
+          <splitter-proportions>
+            <option name="proportions">
+              <list>
+                <option value="0.2" />
+              </list>
+            </option>
+          </splitter-proportions>
+        </settings>
+      </state>
+    </states>
+  </component>
+</project>
\ No newline at end of file
diff --git a/dev/20200414/maj83/Welsh Vocabulary Tutor/Match the meaning/Match the meaning.iml b/dev/20200414/maj83/Welsh Vocabulary Tutor/Match the meaning/Match the meaning.iml
new file mode 100644
index 0000000..fb8e866
--- /dev/null
+++ b/dev/20200414/maj83/Welsh Vocabulary Tutor/Match the meaning/Match the meaning.iml	
@@ -0,0 +1,12 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<module type="JAVA_MODULE" version="4">
+  <component name="NewModuleRootManager" inherit-compiler-output="true">
+    <exclude-output />
+    <content url="file://$MODULE_DIR$">
+      <sourceFolder url="file://$MODULE_DIR$/src" isTestSource="false" />
+    </content>
+    <orderEntry type="inheritedJdk" />
+    <orderEntry type="sourceFolder" forTests="false" />
+    <orderEntry type="library" name="lib" level="project" />
+  </component>
+</module>
\ No newline at end of file
diff --git a/dev/20200414/maj83/Welsh Vocabulary Tutor/Match the meaning/out/production/Match the meaning/DictionaryEntry.class b/dev/20200414/maj83/Welsh Vocabulary Tutor/Match the meaning/out/production/Match the meaning/DictionaryEntry.class
new file mode 100644
index 0000000000000000000000000000000000000000..b3dddef476f23ccc3c8d359279b98c2cfb14fc96
GIT binary patch
literal 1947
zcma)+ZBNrs6vxlqy63?*90LRq6l5z;3Me8E8WEy#J|qxG@KqTNE0mVB1+s7Ahwz0a
z5))qd0sK(L|7q)1wqktIbMHMn_uSt-=YRL>_tj4#TBPS`O45TAC1`?8nN5X_+=Jg|
z5;U8jhk_ESaj0u{T~JT;NI6$#b;UTG-Eu6=I9wJKyHIuhF?nHH2iuKPRZ#ZSQfiJ?
zQ+MGKB=!WwS2RO&)&xb%l^sFSx_N-WTvapF_h%>js<o}`>+tkc&6=X`D3-=+-zhnD
z%@$OszS5A^G!(0`VK`O;r!SQ|nf}Ma5a~nJ+4y_6V!6_}4>5KirZ?m;PLxEVUB3#5
z_oo^5HfxgMADXLf&Hi|;Mkoualta*Uzf|6HPjF1H;2_#E&#aodsd2fAZ55f}24yKn
z`7Cu&ca~C=&QgX=mePXqFHO_29ZNZVr#f}>z|O_#QIh7eG*1gSzbzd$v^xG_|46Ml
zX?jdg1kL%PSe+0PDOUmB%)cQof+84M9T9^1PLyMH-85>7v#U9E%xp(79JKarNM$?Q
z(dpR>X<C97`8p8CSPNb=&dp=hSFMMz35}XoBSEW>XVo;1&rTuTH-@2F>$+mwD!4ue
zx%?bn<z6esfv(zP-p1ulw1DT@Mt&k8;hzHWUZt0Vck@%ME4sd=IqGtP@Rr6q?ia=;
zX!zf8G>SK$#FLjO!h*pp!kTeM$i^L^CX5+^NGK0mz-k3?0%KbKK|+pRQskQ(%YPr;
z6opM8XBsv`x3J23(Nv^ftT<E2&!i)h1Ygn3G<iu;dFqlRdHRxKt(+x_A*KtF-N>1P
z%_DEY%`JQT{oKgp-h}Cj?p-48jBgXgnSIpnpFE3^qhj)Rihji;LX01Goy7oltcg89
zxBbm)h~~s`nUPzdY1i8i+yOU3$%|^j#eFzIgP|Z&JIGKd$WS<l)DAKNkkK1JxX)aH
zJE0)4c98K<kl}EUK<m7UQ~)C10K%<dkh?SjTR>HVt%-bTYt2k3$SB?OH@8|dcukic
z$UHz6ZUAAWGsyjBMP5K#tdSCH1fPVD^%A*)PN=;^O98Ty-|{Gpx%}hw3?pCkDPGSK
O<S~hL66+~^(|-VYjA?%W

literal 0
HcmV?d00001

diff --git a/dev/20200414/maj83/Welsh Vocabulary Tutor/Match the meaning/out/production/Match the meaning/Main.class b/dev/20200414/maj83/Welsh Vocabulary Tutor/Match the meaning/out/production/Match the meaning/Main.class
new file mode 100644
index 0000000000000000000000000000000000000000..bf3ec4d5edd3926a53a9532ac58f528c271d0b21
GIT binary patch
literal 1044
zcmZuwTTj$L7(K%-bSV{dfdx^yd0Q@074IMkA@bB!0!TDI4Q1FZ>9(7;tMIdYS%@aa
zXMdFOOuJGsJaoR9Z@zQB%bEWA{p|;U=U6jgVb(+ew+-AW;jW2$xNoA0IRo<s7EF||
zXyO5u^kN%$DA2d+1zxfyP^ixB2^2TN10^uzc!7G`ZtkmSSMK}tl%3F({+^6HeeODo
zNyCfD;nbuTtPtI#6{u7{IY;udw0#-W?VTj@g8E9zE~7f*hcCGn=#3K@B?4pB6nuDW
z(@|H%b4}q^EApB$I!QeOBbUVqlynhWGGNgY=Mk<76w5gY+lj63SgiTx*j25>3xn9e
zBc6A{cI2u}Pq*8zJ6h6BSh#{g3y(3%{<N2gYcg>gyA4%SGGK2@hsRCdz_NuWcxvF8
zMKN9ojBB`V<NxHG=7p;r9ia2PH1Nv83RW$=#-PAtH%zu#zUN9^tG%A@IY}LmjrqJA
z>fy_F;5H~@e!bz#n4=%4t7KcnX{Q3S*{Cn-lt~w;#D2f+a88wO5xPlx^Fz&XLV2Jf
zPQ&LWC;5w*%Lr2K-|ZhMHzCP*E^0cBEg7jGNmV_cMXokQj8&43<-&VNp{YB2PH`jr
zf*C$|i$4Hpg%*qJ5KlI(pzWPMh4{)%53X|UOPwWL<KD^wP{uG%{TRV0JsP}Bn}N^J
zlY>o?fH{iH@-IOJWAw94TxWzP@EB8|ohlc~#SVJU(DxHYZQ(mg9~V#2-+{T%!9Y%3
tCIGBskX1~uj!9I~6w?_^w?-23_6Aew0&e0K(@hdrq-ToXH1|E2`2){a=(GR;

literal 0
HcmV?d00001

diff --git a/dev/20200414/maj83/Welsh Vocabulary Tutor/Match the meaning/out/production/Match the meaning/MatchTheMeaning.fxml b/dev/20200414/maj83/Welsh Vocabulary Tutor/Match the meaning/out/production/Match the meaning/MatchTheMeaning.fxml
new file mode 100644
index 0000000..bc51870
--- /dev/null
+++ b/dev/20200414/maj83/Welsh Vocabulary Tutor/Match the meaning/out/production/Match the meaning/MatchTheMeaning.fxml	
@@ -0,0 +1,71 @@
+<?xml version="1.0" encoding="UTF-8"?>
+
+<?import java.lang.String?>
+<?import javafx.collections.FXCollections?>
+<?import javafx.scene.control.Button?>
+<?import javafx.scene.control.ComboBox?>
+<?import javafx.scene.control.Label?>
+<?import javafx.scene.layout.Pane?>
+
+<Pane maxHeight="-Infinity" maxWidth="-Infinity" minHeight="-Infinity" minWidth="-Infinity" prefHeight="400.0" prefWidth="600.0" xmlns="http://javafx.com/javafx/11.0.1" xmlns:fx="http://javafx.com/fxml/1" fx:controller="MyController">
+   <children>
+      <Button fx:id="ConfirmButton"  layoutX="271.0" layoutY="321.0" mnemonicParsing="false" text="Confirm" onAction="#checkAnswers" />
+      <Label layoutX="248.0" layoutY="356.0" text="Match the meaning" />
+      <ComboBox fx:id="word1" layoutX="448.0" layoutY="118.0" prefHeight="25.0" prefWidth="58.0">
+              <items>
+                 <FXCollections fx:factory="observableArrayList">
+                    <String fx:value="1" />
+                    <String fx:value="2" />
+                    <String fx:value="3" />
+                    <String fx:value="4" />
+                 </FXCollections>
+              </items>
+      </ComboBox>
+      <ComboBox fx:id="word2" layoutX="448.0" layoutY="153.0" prefHeight="25.0" prefWidth="58.0">
+         <items>
+            <FXCollections fx:factory="observableArrayList">
+               <String fx:value="1" />
+               <String fx:value="2" />
+               <String fx:value="3" />
+               <String fx:value="4" />
+            </FXCollections>
+         </items>
+      </ComboBox>
+      <ComboBox fx:id="word3" layoutX="448.0" layoutY="188.0" prefHeight="25.0" prefWidth="58.0">
+         <items>
+            <FXCollections fx:factory="observableArrayList">
+               <String fx:value="1" />
+               <String fx:value="2" />
+               <String fx:value="3" />
+               <String fx:value="4" />
+            </FXCollections>
+         </items>
+      </ComboBox>
+      <ComboBox fx:id="word4" layoutX="448.0" layoutY="223.0" prefHeight="25.0" prefWidth="58.0">
+         <items>
+            <FXCollections fx:factory="observableArrayList">
+               <String fx:value="1" />
+               <String fx:value="2" />
+               <String fx:value="3" />
+               <String fx:value="4" />
+            </FXCollections>
+         </items>
+      </ComboBox>
+      <Label fx:id="WelshWord1" layoutX="343.0" layoutY="122.0" text="Welsh word#3" />
+      <Label fx:id="WelshWord2" layoutX="343.0" layoutY="157.0" text="Welsh word#2" />
+      <Label fx:id="WelshWord3" layoutX="343.0" layoutY="192.0" text="Welsh word#1" />
+      <Label fx:id="WelshWord4" layoutX="343.0" layoutY="227.0" text="Welsh word#4" />
+      <Label fx:id="EngWord1" layoutX="115.0" layoutY="122.0" text="English Word #1" />
+      <Label fx:id="EngWord2" layoutX="115.0" layoutY="157.0" text="English Word #2" />
+      <Label fx:id="EngWord3" layoutX="115.0" layoutY="192.0" text="English Word #3" />
+      <Label fx:id="EngWord4" layoutX="115.0" layoutY="227.0" text="English Word #4" />
+      <Label layoutX="105.0" layoutY="122.0" text="1." />
+      <Label layoutX="105.0" layoutY="157.0" text="2." />
+      <Label layoutX="105.0" layoutY="192.0" text="3." />
+      <Label layoutX="105.0" layoutY="227.0" text="4." />
+      <Label layoutX="367.0" layoutY="23.0" text="Correct answers:" />
+      <Label layoutX="368.0" layoutY="53.0" text="Wrong answers:" />
+      <Label fx:id="CorrectAnswer" layoutX="463.0" layoutY="23.0" text="0" />
+      <Label fx:id="WrongAnswer" layoutX="463.0" layoutY="53.0" text="0" />
+   </children>
+</Pane>
diff --git a/dev/20200414/maj83/Welsh Vocabulary Tutor/Match the meaning/out/production/Match the meaning/MyController.class b/dev/20200414/maj83/Welsh Vocabulary Tutor/Match the meaning/out/production/Match the meaning/MyController.class
new file mode 100644
index 0000000000000000000000000000000000000000..b818c7cbaba59890a4ec802871e5231604e9f1ab
GIT binary patch
literal 4590
zcma)9`+F4S6@F*4+1V^ZE{g%7AYeg4HWCnu)c`gG5Hul5LSnS7Om-*9z-Bg?olOYV
zYAf2iR@>TAdr^y}_i789RK(JItF;$<vG!uGPyd1b(5L-D`ktBD-C1_i2lC|1cg}at
z`ObIFd(IbLc>USu0bGlJ#IOVRsW=`(2=~=tJMLHUKn%4W^BxuNRq?(U>hS&;K7bF#
z5XFZ??Li?A3Hh*)hsER(6(5Nqj*rIhF+3{bj|=&PkP|U{5|7F1Q{v+hartRc{*1^z
zE97w@Pl%%@C7RDkXeWhzDvHlXaVm;0h`|@5_)-*Kj^Zm(d^L)%Me+40o)+6@V)zEW
zsp7OaKO>U7kXa#f64SS0*o2e9J}W9`W%XQ)<eZS_ReW2;c@^JL5VmzIr6AsYSfA3{
zbB>vAKR`)lyhA~K)^K`9Zp|54$IMt+1&ae(-KKTKNOhZ8hnjVL=BTARIonXMzN*r;
z?p<b5-01eqZp*P}I(E>m)-lE>HYsQh*mT;qKI8jsttQ{*3DdeY+P=?nj8VgOokfxv
zyHmnc_9=)?+Zk)rWoxH1c8Z6rbnQltwr7)uWwa+V3?q|n@5+o1XLe?eGMvr-Un6*M
zpJSWWsC(|x13Akv$Bh9qYYwN4PRq(Tx}PyGuRL?)=y<w)&uu;3a%&0b8vnc5|88N-
zyRFedFV^MNBk9(MjWj(JH0h+Uq@Ti)u402mIy>e&D>2kBF|;T#v{~4dv27#iFlp0<
ztzf~RpF)?5Y%?v>*`c7OW&Hqg)0IiF*bRh%u|GFHY}oxeFE2>SB=z)wZkxjU!mu-D
zvM}}CJu_Wi+S4o=annz1xtCI~p~b7Ki@^Z80@4yRB!s%j5;E%q#=Uk*;$B=H!OTP<
zih=4URD))<Lxbfn;Z7paMhz#>CiC5-dS@^Vim4zXH@I_>Nt!T|?5u)61x*#L!@{MC
z-NeH6IePL)k3QjNyZ_SfSv{m`8DYss%ygQUO^zAKBOXXt)6g_qD>O}Hg{Fz9(6pdW
zpknH2^B4h<@T0K|r~Tl8?v6le4;a}@&Q2OTb5<&CbVw>|ayHMX_mm1I6xd~|3YN|9
zhUfRWZugi1$fh9XHprOMa3>BaXuNpjX?P1d6<k)5mtd%2C%P0YD(w})$Rk{7a3E>;
zF21MY`x<_LAIf<@(y#|NYS@RHG~6tt9|tx37(ZbXT{Idsynq)~{8YnB_?d<QQ5+O<
z8xE@YxrSfhml}pd@-lv<;n#Rk!|lS}A>^$>ej^*d#VZ<qhgUWH9<OrF=)=RtjQiCc
zenZx{g!TsoD#waxOfg%vN!v)}SnMgo9_9w8WYVx54wvMN#YvmuW1*(Ztf6PA9Z9B*
zk(rc+ZuF@5qlQ1>wL)Uuba-P@!=LdN4Y#64!vP_ELjEdYzfFSu8~(20?Xt?@kcJVA
z5@x}&mHF%)KFlelV5wxiFk1H&5a&%HbxKd?jNTDWgO+_h$b<D^(*?@!mXcVG=vjGq
z6s&Ez!^4+r;~m&h-Yf3Aw=~#kU72*6f$@#=kj$aLm#zGG-xVRsU5@*-nH?kIT7n_^
zPYW^bU$FeW^2eph$GP7)>K+k@)i;(_YA#{56dG@-X2)_PBhng+g5kSQuGmFQ%NdaL
zxwBs0QpW1OCxk`T?P=BG$((@{@P1T@7?U|YP3O(N%d*7XPEWcZ=eppoA8KXrl@bYS
zMb&H+UT-f-KkV{+7IPk*(Cw_@hFunBA!odY%By-=jXD`mUQt6|9jp1L)D9@P0gL!o
z97hNL&{SkhknZ9-gx&mQ*BAM{lyU%&LS_JINIHkq)8CI?$|BUi#oc4W%)7@vns<-w
zHSZqB4*i#(!wFL%<G`tqasE`uIEE@@oJAEfj;0D3Csl=v1EE63(QuJWa>OA{sxwm$
zL*)wSYn_GCdKRIfS=5|Cn9Eu&BWIv;868s3p>C+AW{wZUP&n*<YHQt3BqE<VESQCM
z1`AthT`#2J8MhF_q{~<sAcinBG+-h5dhF$@2aQN_NAp5J3WjULDaIl&Jf(v+HI$ue
zJ&ndhO&(3>5zk{$9+y$loCseeS)8c7NU|gm2};`La5*iPCfew1*?H9E@rJ_wa?k6E
zL>t{!-@78w#sjMFtxUA>s49Dsh#E*DTA2h8`EeqD4RODf$lpuUcN6bp#QSj~{&7m4
zBi1D`tGvtmiD4S3B|Rc5le!@s=6W%|-rnxw-rgdLk8qX7IH@Fb2|d<Q+h!8Ni9A+?
zQ+cf3p5WajwfiYnMS2p~*K7?phkgD@w8*O2&-c}NTzLYKQ;3U{+#3gvhm}(oUOok_
zDDh3BPh5CZmQVB4u$zSqSitpuf}j^m*soXedE3O-Z5JQ68;RFj$Pe*nnD6m8pE=3I
z7Dm06S{8dhOv`>`xC+t!W=vqx&68cslMUO=lVryOmq;W#SxOcWj;~{lq9U%W{x9l7
z|Ka~Oy)oj@B_C2MGFf=Y9Voy-iT^C(L-957wehQFu}*GW6t=|I$JsvR!bH5SQuFHg
zhN7_49*f<I=xFARTY1|Xc#nRzg52AS{-A#|1yhCKl-ImUD(e_WdmbClW78b238%J^
z-yGn#liw2HcaVQmfZyuYxYPvPUYf_&Jgz-~#@3<Js1F}vOP^wElW7p9fjX*>m^_w~
zTX88CRPx$aEUvf|ivr%fLsnjb$(!lAeh$}pt$aPX29GN>;eG-DY@|lE&?+|2MjT-q
zjuUJaB^g3w5)TqCk8$-B(Quwge+kog1vB^;j<NghQewDUxg7T>SK;0wJfW=f%hbp=
zn<hLJtRl#cx<K8Cf7AXZ7OfNi#4)bIE*O^}dV$B*s@SgZA5gcBKP`1Mz6<a0fjCIB
z8V23enny<~FQxK#VIJE`AgXs2j??S?yx9Y8RNnY#Dz-%v?#4Uml8$f>BM))?E^;Bf
F`+x9|N$das

literal 0
HcmV?d00001

diff --git a/dev/20200414/maj83/Welsh Vocabulary Tutor/Match the meaning/src/DictionaryEntry.java b/dev/20200414/maj83/Welsh Vocabulary Tutor/Match the meaning/src/DictionaryEntry.java
new file mode 100644
index 0000000..9829506
--- /dev/null
+++ b/dev/20200414/maj83/Welsh Vocabulary Tutor/Match the meaning/src/DictionaryEntry.java	
@@ -0,0 +1,64 @@
+public class DictionaryEntry {
+
+        private String english;
+        private String welsh;
+        private String wordType;
+        private boolean practiceWord;
+
+
+        public DictionaryEntry(){
+            practiceWord = false;
+        }
+
+        public DictionaryEntry(String english, String welsh, String wordType ){
+            this.english = english;
+            this.welsh = welsh;
+            this.wordType = wordType;
+        }
+
+        public String getEnglish() {
+            return english;
+        }
+
+        public void setEnglish(String english) {
+            this.english = english;
+        }
+
+        public String getWelsh() {
+            return welsh;
+        }
+
+        public void setWelsh(String welsh) {
+            this.welsh = welsh;
+        }
+
+
+        public String getWordType() {
+            return wordType;
+        }
+
+        public void setWordType(String wordType) {
+            this.wordType = wordType;
+        }
+
+
+        public boolean isPracticeWord() {
+            return practiceWord;
+        }
+
+
+        public void setPracticeWord(boolean practiceWord) {
+            this.practiceWord = practiceWord;
+        }
+
+
+        @Override
+        public String toString() {
+            return "english='" + english + "'\t" +
+                    "welsh='" + welsh + "'\t" +
+                    "wordType='" + wordType + "'" +
+                    "practiceWord = " + practiceWord;
+        }
+
+}
+
diff --git a/dev/20200414/maj83/Welsh Vocabulary Tutor/Match the meaning/src/Main.java b/dev/20200414/maj83/Welsh Vocabulary Tutor/Match the meaning/src/Main.java
new file mode 100644
index 0000000..09e948f
--- /dev/null
+++ b/dev/20200414/maj83/Welsh Vocabulary Tutor/Match the meaning/src/Main.java	
@@ -0,0 +1,23 @@
+import javafx.application.Application;
+import javafx.fxml.FXMLLoader;
+import javafx.scene.Scene;
+import javafx.scene.layout.Pane;
+import javafx.stage.Stage;
+
+
+public class Main extends Application{
+
+    public static void main(String[] args) {
+
+
+        launch(args);
+    }
+
+
+    @Override
+    public void start(Stage primaryStage) throws Exception{
+        Pane mainPane = FXMLLoader.load(Main.class.getResource("MatchTheMeaning.fxml"));
+        primaryStage.setScene(new Scene(mainPane));
+        primaryStage.show();
+     }
+}
diff --git a/dev/20200414/maj83/Welsh Vocabulary Tutor/Match the meaning/src/MatchTheMeaning.fxml b/dev/20200414/maj83/Welsh Vocabulary Tutor/Match the meaning/src/MatchTheMeaning.fxml
new file mode 100644
index 0000000..bc51870
--- /dev/null
+++ b/dev/20200414/maj83/Welsh Vocabulary Tutor/Match the meaning/src/MatchTheMeaning.fxml	
@@ -0,0 +1,71 @@
+<?xml version="1.0" encoding="UTF-8"?>
+
+<?import java.lang.String?>
+<?import javafx.collections.FXCollections?>
+<?import javafx.scene.control.Button?>
+<?import javafx.scene.control.ComboBox?>
+<?import javafx.scene.control.Label?>
+<?import javafx.scene.layout.Pane?>
+
+<Pane maxHeight="-Infinity" maxWidth="-Infinity" minHeight="-Infinity" minWidth="-Infinity" prefHeight="400.0" prefWidth="600.0" xmlns="http://javafx.com/javafx/11.0.1" xmlns:fx="http://javafx.com/fxml/1" fx:controller="MyController">
+   <children>
+      <Button fx:id="ConfirmButton"  layoutX="271.0" layoutY="321.0" mnemonicParsing="false" text="Confirm" onAction="#checkAnswers" />
+      <Label layoutX="248.0" layoutY="356.0" text="Match the meaning" />
+      <ComboBox fx:id="word1" layoutX="448.0" layoutY="118.0" prefHeight="25.0" prefWidth="58.0">
+              <items>
+                 <FXCollections fx:factory="observableArrayList">
+                    <String fx:value="1" />
+                    <String fx:value="2" />
+                    <String fx:value="3" />
+                    <String fx:value="4" />
+                 </FXCollections>
+              </items>
+      </ComboBox>
+      <ComboBox fx:id="word2" layoutX="448.0" layoutY="153.0" prefHeight="25.0" prefWidth="58.0">
+         <items>
+            <FXCollections fx:factory="observableArrayList">
+               <String fx:value="1" />
+               <String fx:value="2" />
+               <String fx:value="3" />
+               <String fx:value="4" />
+            </FXCollections>
+         </items>
+      </ComboBox>
+      <ComboBox fx:id="word3" layoutX="448.0" layoutY="188.0" prefHeight="25.0" prefWidth="58.0">
+         <items>
+            <FXCollections fx:factory="observableArrayList">
+               <String fx:value="1" />
+               <String fx:value="2" />
+               <String fx:value="3" />
+               <String fx:value="4" />
+            </FXCollections>
+         </items>
+      </ComboBox>
+      <ComboBox fx:id="word4" layoutX="448.0" layoutY="223.0" prefHeight="25.0" prefWidth="58.0">
+         <items>
+            <FXCollections fx:factory="observableArrayList">
+               <String fx:value="1" />
+               <String fx:value="2" />
+               <String fx:value="3" />
+               <String fx:value="4" />
+            </FXCollections>
+         </items>
+      </ComboBox>
+      <Label fx:id="WelshWord1" layoutX="343.0" layoutY="122.0" text="Welsh word#3" />
+      <Label fx:id="WelshWord2" layoutX="343.0" layoutY="157.0" text="Welsh word#2" />
+      <Label fx:id="WelshWord3" layoutX="343.0" layoutY="192.0" text="Welsh word#1" />
+      <Label fx:id="WelshWord4" layoutX="343.0" layoutY="227.0" text="Welsh word#4" />
+      <Label fx:id="EngWord1" layoutX="115.0" layoutY="122.0" text="English Word #1" />
+      <Label fx:id="EngWord2" layoutX="115.0" layoutY="157.0" text="English Word #2" />
+      <Label fx:id="EngWord3" layoutX="115.0" layoutY="192.0" text="English Word #3" />
+      <Label fx:id="EngWord4" layoutX="115.0" layoutY="227.0" text="English Word #4" />
+      <Label layoutX="105.0" layoutY="122.0" text="1." />
+      <Label layoutX="105.0" layoutY="157.0" text="2." />
+      <Label layoutX="105.0" layoutY="192.0" text="3." />
+      <Label layoutX="105.0" layoutY="227.0" text="4." />
+      <Label layoutX="367.0" layoutY="23.0" text="Correct answers:" />
+      <Label layoutX="368.0" layoutY="53.0" text="Wrong answers:" />
+      <Label fx:id="CorrectAnswer" layoutX="463.0" layoutY="23.0" text="0" />
+      <Label fx:id="WrongAnswer" layoutX="463.0" layoutY="53.0" text="0" />
+   </children>
+</Pane>
diff --git a/dev/20200414/maj83/Welsh Vocabulary Tutor/Match the meaning/src/MyController.java b/dev/20200414/maj83/Welsh Vocabulary Tutor/Match the meaning/src/MyController.java
new file mode 100644
index 0000000..ab57ba5
--- /dev/null
+++ b/dev/20200414/maj83/Welsh Vocabulary Tutor/Match the meaning/src/MyController.java	
@@ -0,0 +1,135 @@
+import javafx.fxml.FXML;
+import javafx.fxml.Initializable;
+import javafx.scene.control.Button;
+import javafx.scene.control.ComboBox;
+import javafx.scene.control.Label;
+
+import java.net.URL;
+import java.util.*;
+
+public class MyController implements Initializable {
+
+    private Random rand = new Random();
+    public LinkedList<DictionaryEntry> setOfQuestions=new LinkedList<>();
+    private ArrayList<Integer> temp1 = new ArrayList<>(Arrays.asList(0,1,2,3));
+    int corAns = 0;
+    int wrongAns = 0;
+
+    @FXML
+    private ComboBox<String> word1;
+
+    @FXML
+    private ComboBox<String> word2;
+
+    @FXML
+    private ComboBox<String> word3;
+
+    @FXML
+    private ComboBox<String> word4;
+
+    @FXML
+    private Label EngWord1;
+
+    @FXML
+    private Label EngWord2;
+
+    @FXML
+    private Label EngWord3;
+
+    @FXML
+    private Label EngWord4;
+
+    @FXML
+    private Label WelshWord1;
+
+    @FXML
+    private Label WelshWord2;
+
+    @FXML
+    private Label WelshWord3;
+
+    @FXML
+    private Label WelshWord4;
+
+    @FXML
+    private Label CorrectAnswer;
+
+    @FXML
+    private Label WrongAnswer;
+
+
+    private void TestLabel(LinkedList<DictionaryEntry> questions, ArrayList<Integer> randOrder){
+        EngWord1.setText(questions.get(0).getEnglish());
+        EngWord2.setText(questions.get(1).getEnglish());
+        EngWord3.setText(questions.get(2).getEnglish());
+        EngWord4.setText(questions.get(3).getEnglish());
+
+        Collections.shuffle(randOrder);
+
+        WelshWord1.setText(questions.get(randOrder.get(0)).getWelsh());
+        WelshWord2.setText(questions.get(randOrder.get(1)).getWelsh());
+        WelshWord3.setText(questions.get(randOrder.get(2)).getWelsh());
+        WelshWord4.setText(questions.get(randOrder.get(3)).getWelsh());
+    }
+
+    private LinkedList<DictionaryEntry> getQuestions(LinkedList<DictionaryEntry> dictionary){
+
+        do{
+            int rand_q=rand.nextInt(dictionary.size()-1);
+            DictionaryEntry pickedQuestion = dictionary.get(rand_q);
+            if(setOfQuestions.size()>1){
+                for(int i=0;i<setOfQuestions.size();i++){
+                    if(setOfQuestions.get(i).equals(pickedQuestion)){
+                        break;
+                    }else {
+                        setOfQuestions.add(pickedQuestion);
+                    }
+                }
+            }else{
+                setOfQuestions.add(pickedQuestion);
+            }
+
+        }while(setOfQuestions.size()<5);
+        return setOfQuestions;
+    }
+
+    private void fill(){
+        setOfQuestions.add(new DictionaryEntry("abbey", "abaty", "nm"));
+        setOfQuestions.add(new DictionaryEntry("believe", "credu", "verb"));
+        setOfQuestions.add(new DictionaryEntry("concert", "cyngerdd", "nm"));
+        setOfQuestions.add(new DictionaryEntry("disease", "clefyd", "nm"));
+    }
+
+    public void checkAnswers(){
+        int w1 = Integer.parseInt(word1.getValue())-1;
+        int w2 = Integer.parseInt(word2.getValue())-1;
+        int w3 = Integer.parseInt(word3.getValue())-1;
+        int w4 = Integer.parseInt(word4.getValue())-1;
+
+        if(setOfQuestions.get(w1).getWelsh().equals(WelshWord1.getText())){
+            corAns++;
+        }else wrongAns++;
+
+        if(setOfQuestions.get(w2).getWelsh().equals(WelshWord2.getText())){
+            corAns++;
+        }else wrongAns++;
+
+        if(setOfQuestions.get(w3).getWelsh().equals(WelshWord3.getText())){
+            corAns++;
+        }else wrongAns++;
+
+        if(setOfQuestions.get(w4).getWelsh().equals(WelshWord4.getText())){
+            corAns++;
+        }else wrongAns++;
+
+        CorrectAnswer.setText(Integer.toString(corAns));
+
+        WrongAnswer.setText(Integer.toString(wrongAns));
+    }
+
+    @Override
+    public void initialize(URL url, ResourceBundle resourceBundle) {
+        this.fill();
+        TestLabel(setOfQuestions,temp1);
+    }
+}