diff --git a/.idea/libraries/Drools_6_2_0.xml b/.idea/libraries/Drools_6_2_0.xml
deleted file mode 100644
index 0a7099b..0000000
--- a/.idea/libraries/Drools_6_2_0.xml
+++ /dev/null
@@ -1,93 +0,0 @@
-<component name="libraryTable">
-  <library name="Drools-6.2.0">
-    <CLASSES>
-      <root url="jar://$PROJECT_DIR$/lib/drools-decisiontables-6.2.0.Final.jar!/" />
-      <root url="jar://$PROJECT_DIR$/lib/drools-jsr94-6.2.0.Final.jar!/" />
-      <root url="jar://$PROJECT_DIR$/lib/drools-core-6.2.0.Final.jar!/" />
-      <root url="jar://$PROJECT_DIR$/lib/drools-compiler-6.2.0.Final.jar!/" />
-      <root url="jar://$PROJECT_DIR$/lib/drools-persistence-jpa-6.2.0.Final.jar!/" />
-      <root url="jar://$PROJECT_DIR$/lib/drools-templates-6.2.0.Final.jar!/" />
-      <root url="jar://$PROJECT_DIR$/lib/kie-api-6.2.0.Final.jar!/" />
-      <root url="jar://$PROJECT_DIR$/lib/kie-internal-6.2.0.Final.jar!/" />
-      <root url="jar://$PROJECT_DIR$/lib/drools-verifier-6.2.0.Final.jar!/" />
-      <root url="jar://$PROJECT_DIR$/lib/kie-ci-6.2.0.Final.jar!/" />
-      <root url="jar://$PROJECT_DIR$/lib/jboss-interceptors-api_1.1_spec-1.0.1.Final.jar!/" />
-      <root url="jar://$PROJECT_DIR$/lib/jboss-transaction-api_1.1_spec-1.0.1.Final.jar!/" />
-      <root url="jar://$PROJECT_DIR$/lib/aether-api-1.0.0.v20140518.jar!/" />
-      <root url="jar://$PROJECT_DIR$/lib/aether-connector-basic-1.0.0.v20140518.jar!/" />
-      <root url="jar://$PROJECT_DIR$/lib/aether-impl-1.0.0.v20140518.jar!/" />
-      <root url="jar://$PROJECT_DIR$/lib/aether-transport-file-1.0.0.v20140518.jar!/" />
-      <root url="jar://$PROJECT_DIR$/lib/aether-spi-1.0.0.v20140518.jar!/" />
-      <root url="jar://$PROJECT_DIR$/lib/aether-transport-http-1.0.0.v20140518.jar!/" />
-      <root url="jar://$PROJECT_DIR$/lib/aether-transport-wagon-1.0.0.v20140518.jar!/" />
-      <root url="jar://$PROJECT_DIR$/lib/aether-util-1.0.0.v20140518.jar!/" />
-      <root url="jar://$PROJECT_DIR$/lib/ant-1.8.2.jar!/" />
-      <root url="jar://$PROJECT_DIR$/lib/ant-launcher-1.8.2.jar!/" />
-      <root url="jar://$PROJECT_DIR$/lib/aopalliance-1.0.jar!/" />
-      <root url="jar://$PROJECT_DIR$/lib/cdi-api-1.0-SP4.jar!/" />
-      <root url="jar://$PROJECT_DIR$/lib/commons-logging-1.1.1.jar!/" />
-      <root url="jar://$PROJECT_DIR$/lib/commons-codec-1.4.jar!/" />
-      <root url="jar://$PROJECT_DIR$/lib/dom4j-1.6.1.jar!/" />
-      <root url="jar://$PROJECT_DIR$/lib/antlr-runtime-3.5.jar!/" />
-      <root url="jar://$PROJECT_DIR$/lib/hibernate-jpa-2.0-api-1.0.1.Final.jar!/" />
-      <root url="jar://$PROJECT_DIR$/lib/ecj-4.3.1.jar!/" />
-      <root url="jar://$PROJECT_DIR$/lib/httpclient-4.3.6.jar!/" />
-      <root url="jar://$PROJECT_DIR$/lib/itext-2.1.2.jar!/" />
-      <root url="jar://$PROJECT_DIR$/lib/guava-13.0.1.jar!/" />
-      <root url="jar://$PROJECT_DIR$/lib/javassist-3.18.1-GA.jar!/" />
-      <root url="jar://$PROJECT_DIR$/lib/javax.inject-1.jar!/" />
-      <root url="jar://$PROJECT_DIR$/lib/jcl-over-slf4j-1.7.2.jar!/" />
-      <root url="jar://$PROJECT_DIR$/lib/httpcore-4.3.3.jar!/" />
-      <root url="jar://$PROJECT_DIR$/lib/jsr250-api-1.0.jar!/" />
-      <root url="jar://$PROJECT_DIR$/lib/maven-artifact-3.2.2.jar!/" />
-      <root url="jar://$PROJECT_DIR$/lib/maven-aether-provider-3.2.2.jar!/" />
-      <root url="jar://$PROJECT_DIR$/lib/jsoup-1.7.1.jar!/" />
-      <root url="jar://$PROJECT_DIR$/lib/jsr94-1.1.jar!/" />
-      <root url="jar://$PROJECT_DIR$/lib/maven-core-3.2.2.jar!/" />
-      <root url="jar://$PROJECT_DIR$/lib/maven-model-builder-3.2.2.jar!/" />
-      <root url="jar://$PROJECT_DIR$/lib/maven-model-3.2.2.jar!/" />
-      <root url="jar://$PROJECT_DIR$/lib/maven-compat-3.2.2.jar!/" />
-      <root url="jar://$PROJECT_DIR$/lib/maven-plugin-api-3.2.2.jar!/" />
-      <root url="jar://$PROJECT_DIR$/lib/maven-repository-metadata-3.2.2.jar!/" />
-      <root url="jar://$PROJECT_DIR$/lib/mvel2-2.2.4.Final.jar!/" />
-      <root url="jar://$PROJECT_DIR$/lib/maven-settings-3.2.2.jar!/" />
-      <root url="jar://$PROJECT_DIR$/lib/maven-settings-builder-3.2.2.jar!/" />
-      <root url="jar://$PROJECT_DIR$/lib/plexus-cipher-1.4.jar!/" />
-      <root url="jar://$PROJECT_DIR$/lib/plexus-component-annotations-1.5.5.jar!/" />
-      <root url="jar://$PROJECT_DIR$/lib/org.eclipse.sisu.inject-0.0.0.M5.jar!/" />
-      <root url="jar://$PROJECT_DIR$/lib/org.eclipse.sisu.plexus-0.0.0.M5.jar!/" />
-      <root url="jar://$PROJECT_DIR$/lib/plexus-classworlds-2.5.1.jar!/" />
-      <root url="jar://$PROJECT_DIR$/lib/plexus-interpolation-1.19.jar!/" />
-      <root url="jar://$PROJECT_DIR$/lib/plexus-sec-dispatcher-1.3.jar!/" />
-      <root url="jar://$PROJECT_DIR$/lib/poi-ooxml-3.10.1.jar!/" />
-      <root url="jar://$PROJECT_DIR$/lib/poi-3.10.1.jar!/" />
-      <root url="jar://$PROJECT_DIR$/lib/plexus-utils-3.0.17.jar!/" />
-      <root url="jar://$PROJECT_DIR$/lib/sisu-guice-3.1.0-no_aop.jar!/" />
-      <root url="jar://$PROJECT_DIR$/lib/slf4j-api-1.7.2.jar!/" />
-      <root url="jar://$PROJECT_DIR$/lib/poi-ooxml-schemas-3.10.1.jar!/" />
-      <root url="jar://$PROJECT_DIR$/lib/stax-api-1.0.1.jar!/" />
-      <root url="jar://$PROJECT_DIR$/lib/wagon-http-2.0.jar!/" />
-      <root url="jar://$PROJECT_DIR$/lib/wagon-http-shared4-2.0.jar!/" />
-      <root url="jar://$PROJECT_DIR$/lib/wagon-provider-api-1.0.jar!/" />
-      <root url="jar://$PROJECT_DIR$/lib/xml-apis-1.3.04.jar!/" />
-      <root url="jar://$PROJECT_DIR$/lib/xpp3_min-1.1.4c.jar!/" />
-      <root url="jar://$PROJECT_DIR$/lib/xmlpull-1.1.3.1.jar!/" />
-      <root url="jar://$PROJECT_DIR$/lib/xmlbeans-2.3.0.jar!/" />
-      <root url="jar://$PROJECT_DIR$/lib/xstream-1.4.7.jar!/" />
-      <root url="jar://$PROJECT_DIR$/lib/protobuf-java-2.5.0.jar!/" />
-    </CLASSES>
-    <JAVADOC />
-    <SOURCES>
-      <root url="jar://$PROJECT_DIR$/lib/drools-compiler-6.2.0.Final-sources.jar!/" />
-      <root url="jar://$PROJECT_DIR$/lib/drools-core-6.2.0.Final-sources.jar!/" />
-      <root url="jar://$PROJECT_DIR$/lib/drools-decisiontables-6.2.0.Final-sources.jar!/" />
-      <root url="jar://$PROJECT_DIR$/lib/drools-jsr94-6.2.0.Final-sources.jar!/" />
-      <root url="jar://$PROJECT_DIR$/lib/drools-persistence-jpa-6.2.0.Final-sources.jar!/" />
-      <root url="jar://$PROJECT_DIR$/lib/drools-verifier-6.2.0.Final-sources.jar!/" />
-      <root url="jar://$PROJECT_DIR$/lib/kie-api-6.2.0.Final-sources.jar!/" />
-      <root url="jar://$PROJECT_DIR$/lib/drools-templates-6.2.0.Final-sources.jar!/" />
-      <root url="jar://$PROJECT_DIR$/lib/kie-internal-6.2.0.Final-sources.jar!/" />
-      <root url="jar://$PROJECT_DIR$/lib/kie-ci-6.2.0.Final-sources.jar!/" />
-    </SOURCES>
-  </library>
-</component>
\ No newline at end of file
diff --git a/.idea/misc.xml b/.idea/misc.xml
index e0844bc..0548357 100644
--- a/.idea/misc.xml
+++ b/.idea/misc.xml
@@ -1,6 +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">
+  <component name="ProjectRootManager" version="2" languageLevel="JDK_1_8" default="true" project-jdk-name="1.8" project-jdk-type="JavaSDK">
     <output url="file://$PROJECT_DIR$/out" />
   </component>
 </project>
\ No newline at end of file
diff --git a/.idea/workspace.xml b/.idea/workspace.xml
index 40cd9c3..5ac6fdf 100644
--- a/.idea/workspace.xml
+++ b/.idea/workspace.xml
@@ -2,8 +2,13 @@
 <project version="4">
   <component name="ChangeListManager">
     <list default="true" id="db773f9a-00fd-4a2d-a6a9-bbfafdd60b01" name="Default Changelist" comment="">
+      <change beforePath="$PROJECT_DIR$/.idea/libraries/Drools_6_2_0.xml" beforeDir="false" />
+      <change beforePath="$PROJECT_DIR$/.idea/misc.xml" beforeDir="false" afterPath="$PROJECT_DIR$/.idea/misc.xml" afterDir="false" />
       <change beforePath="$PROJECT_DIR$/.idea/workspace.xml" beforeDir="false" afterPath="$PROJECT_DIR$/.idea/workspace.xml" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/src/FitnessTest_M.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/FitnessTest_M.java" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/Alpha.iml" beforeDir="false" afterPath="$PROJECT_DIR$/Alpha.iml" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/src/FitnessTest_M_Test.java" beforeDir="false" />
+      <change beforePath="$PROJECT_DIR$/src/Main.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/Main.java" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/src/Tage_D.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/Tage_D.java" afterDir="false" />
     </list>
     <ignored path="$PROJECT_DIR$/out/" />
     <option name="EXCLUDED_CONVERTED_TO_IGNORED" value="true" />
@@ -12,52 +17,36 @@
     <option name="HIGHLIGHT_NON_ACTIVE_CHANGELIST" value="false" />
     <option name="LAST_RESOLUTION" value="IGNORE" />
   </component>
+  <component name="DatabaseView">
+    <option name="SHOW_INTERMEDIATE" value="true" />
+    <option name="GROUP_DATA_SOURCES" value="true" />
+    <option name="GROUP_SCHEMA" value="true" />
+    <option name="GROUP_CONTENTS" value="false" />
+    <option name="SORT_POSITIONED" value="false" />
+    <option name="SHOW_EMPTY_GROUPS" value="false" />
+    <option name="AUTO_SCROLL_FROM_SOURCE" value="false" />
+    <option name="HIDDEN_KINDS">
+      <set />
+    </option>
+    <expand />
+    <select />
+  </component>
   <component name="DefaultGradleProjectSettings">
     <option name="isMigrated" value="true" />
   </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="2465">
-              <caret line="149" selection-start-line="149" selection-end-line="149" />
-              <folding>
-                <element signature="imports" expanded="true" />
-              </folding>
-            </state>
-          </provider>
-        </entry>
-      </file>
       <file pinned="false" current-in-tab="true">
-        <entry file="file://$PROJECT_DIR$/src/FitnessTest_M.java">
-          <provider selected="true" editor-type-id="text-editor">
-            <state relative-caret-position="573">
-              <caret line="305" column="37" lean-forward="true" selection-start-line="305" selection-start-column="37" selection-end-line="305" selection-end-column="37" />
-              <folding>
-                <element signature="imports" expanded="true" />
-                <element signature="e#2063#2525#0" expanded="true" />
-                <element signature="e#2524#2525#0" expanded="true" />
-                <element signature="e#2877#3340#0" expanded="true" />
-                <element signature="e#3339#3340#0" expanded="true" />
-                <element signature="e#11696#11697#0" expanded="true" />
-                <element signature="e#11749#11750#0" expanded="true" />
-                <element signature="e#11808#11809#0" expanded="true" />
-                <element signature="e#11863#11864#0" expanded="true" />
-              </folding>
-            </state>
-          </provider>
-        </entry>
-      </file>
-      <file pinned="false" current-in-tab="false">
-        <entry file="file://$PROJECT_DIR$/src/FitnessTest_M_Test.java">
+        <entry file="file://$PROJECT_DIR$/src/Main.java">
           <provider selected="true" editor-type-id="text-editor">
-            <state relative-caret-position="425">
-              <caret line="93" column="31" selection-start-line="93" selection-start-column="31" selection-end-line="93" selection-end-column="31" />
+            <state relative-caret-position="306">
+              <caret line="108" column="27" selection-start-line="108" selection-start-column="27" selection-end-line="108" selection-end-column="27" />
               <folding>
                 <element signature="imports" expanded="true" />
-                <element signature="e#142#143#0" expanded="true" />
-                <element signature="e#192#193#0" expanded="true" />
+                <element signature="e#7514#7647#0" expanded="true" />
+                <element signature="e#7646#7647#0" expanded="true" />
+                <element signature="e#4970#4971#0" expanded="true" />
+                <element signature="e#5006#5007#0" expanded="true" />
               </folding>
             </state>
           </provider>
@@ -111,9 +100,9 @@
         <option value="$PROJECT_DIR$/src/Quiz_Spiel.java" />
         <option value="$PROJECT_DIR$/src/Tage_DTest.java" />
         <option value="$PROJECT_DIR$/src/Tage_D.java" />
-        <option value="$PROJECT_DIR$/src/Main.java" />
         <option value="$PROJECT_DIR$/src/FitnessTest_M_Test.java" />
         <option value="$PROJECT_DIR$/src/FitnessTest_M.java" />
+        <option value="$PROJECT_DIR$/src/Main.java" />
       </list>
     </option>
   </component>
@@ -124,7 +113,8 @@
     </treeState>
   </component>
   <component name="ProjectFrameBounds" extendedState="6">
-    <option name="x" value="528" />
+    <option name="x" value="763" />
+    <option name="y" value="118" />
     <option name="width" value="544" />
     <option name="height" value="586" />
   </component>
@@ -136,8 +126,8 @@
       <foldersAlwaysOnTop value="true" />
     </navigator>
     <panes>
-      <pane id="Scope" />
       <pane id="PackagesPane" />
+      <pane id="Scope" />
       <pane id="ProjectPane">
         <subPane>
           <expand>
@@ -170,7 +160,7 @@
     <property name="com.intellij.testIntegration.createTest.CreateTestDialog.defaultLibrarySuperClass.JUnit5" value="" />
     <property name="create.test.in.the.same.root" value="true" />
     <property name="nodejs_package_manager_path" value="npm" />
-    <property name="project.structure.last.edited" value="Project" />
+    <property name="project.structure.last.edited" value="Global Libraries" />
     <property name="project.structure.proportion" value="0.15" />
     <property name="project.structure.side.proportion" value="0.2" />
     <property name="restartRequiresConfirmation" value="false" />
@@ -196,7 +186,7 @@
       </list>
     </option>
   </component>
-  <component name="RunManager" selected="Application.FitnessTest_M">
+  <component name="RunManager" selected="Application.Main">
     <configuration name="FitnessTest_M" type="Application" factoryName="Application" temporary="true" nameIsGenerated="true">
       <option name="MAIN_CLASS_NAME" value="FitnessTest_M" />
       <module name="Alpha" />
@@ -205,7 +195,7 @@
       </method>
     </configuration>
     <configuration name="Main" type="Application" factoryName="Application" temporary="true" nameIsGenerated="true">
-      <option name="ALTERNATIVE_JRE_PATH" value="11" />
+      <option name="ALTERNATIVE_JRE_PATH" value="1.8" />
       <option name="ALTERNATIVE_JRE_PATH_ENABLED" value="true" />
       <option name="MAIN_CLASS_NAME" value="Main" />
       <module name="Alpha" />
@@ -220,18 +210,12 @@
         <option name="Make" enabled="true" />
       </method>
     </configuration>
-    <configuration name="Tage_D" type="Application" factoryName="Application" temporary="true" nameIsGenerated="true">
-      <option name="MAIN_CLASS_NAME" value="Tage_D" />
-      <module name="Alpha" />
-      <method v="2">
-        <option name="Make" enabled="true" />
-      </method>
-    </configuration>
-    <configuration name="FitnessTest_M_Test" type="JUnit" factoryName="JUnit" temporary="true" nameIsGenerated="true">
+    <configuration name="Quiz_SpielTest.main" type="JUnit" factoryName="JUnit" temporary="true" nameIsGenerated="true">
       <module name="Alpha" />
       <option name="PACKAGE_NAME" value="" />
-      <option name="MAIN_CLASS_NAME" value="FitnessTest_M_Test" />
-      <option name="TEST_OBJECT" value="class" />
+      <option name="MAIN_CLASS_NAME" value="Quiz_SpielTest" />
+      <option name="METHOD_NAME" value="main" />
+      <option name="TEST_OBJECT" value="method" />
       <method v="2">
         <option name="Make" enabled="true" />
       </method>
@@ -240,16 +224,14 @@
       <item itemvalue="Application.FitnessTest_M" />
       <item itemvalue="Application.Main" />
       <item itemvalue="Application.Quiz_Spiel" />
-      <item itemvalue="Application.Tage_D" />
-      <item itemvalue="JUnit.FitnessTest_M_Test" />
+      <item itemvalue="JUnit.Quiz_SpielTest.main" />
     </list>
     <recent_temporary>
       <list>
-        <item itemvalue="Application.FitnessTest_M" />
         <item itemvalue="Application.Main" />
-        <item itemvalue="JUnit.FitnessTest_M_Test" />
+        <item itemvalue="JUnit.Quiz_SpielTest.main" />
+        <item itemvalue="Application.FitnessTest_M" />
         <item itemvalue="Application.Quiz_Spiel" />
-        <item itemvalue="Application.Tage_D" />
       </list>
     </recent_temporary>
   </component>
@@ -277,6 +259,10 @@
       <workItem from="1562856644601" duration="8772000" />
       <workItem from="1562929796678" duration="3793000" />
       <workItem from="1563047167511" duration="5798000" />
+      <workItem from="1563287106360" duration="360000" />
+      <workItem from="1563287562971" duration="62000" />
+      <workItem from="1563287767375" duration="958000" />
+      <workItem from="1563288959571" duration="820000" />
     </task>
     <task id="LOCAL-00001" summary="neue master">
       <created>1562341097724</created>
@@ -495,35 +481,7 @@
       <option name="project" value="LOCAL" />
       <updated>1563278597504</updated>
     </task>
-    <task id="LOCAL-00032" summary="Commit #10. Bestätigungsbuttons eingefügt.">
-      <created>1563281180742</created>
-      <option name="number" value="00032" />
-      <option name="presentableId" value="LOCAL-00032" />
-      <option name="project" value="LOCAL" />
-      <updated>1563281180742</updated>
-    </task>
-    <task id="LOCAL-00033" summary="Commit #11. Erste Berechnungsfunktionen für das Gesammtergebnis erstellt.">
-      <created>1563283451442</created>
-      <option name="number" value="00033" />
-      <option name="presentableId" value="LOCAL-00033" />
-      <option name="project" value="LOCAL" />
-      <updated>1563283451442</updated>
-    </task>
-    <task id="LOCAL-00034" summary="Commit #11. Erste Berechnungsfunktionen für das Gesammtergebnis erstellt.">
-      <created>1563284513496</created>
-      <option name="number" value="00034" />
-      <option name="presentableId" value="LOCAL-00034" />
-      <option name="project" value="LOCAL" />
-      <updated>1563284513496</updated>
-    </task>
-    <task id="LOCAL-00035" summary="Commit #12 (Wiederholungscommit). Der Fitnesstest ist im Grunde Fertig. Eine Gesammtpunktzahl wird nun berechnet, falls der Bmi und die Fragen bestätigt wurden.">
-      <created>1563284689038</created>
-      <option name="number" value="00035" />
-      <option name="presentableId" value="LOCAL-00035" />
-      <option name="project" value="LOCAL" />
-      <updated>1563284689038</updated>
-    </task>
-    <option name="localTasksCounter" value="36" />
+    <option name="localTasksCounter" value="32" />
     <servers />
   </component>
   <component name="TestHistory">
@@ -536,34 +494,52 @@
     <history-entry file="FitnessTest_M_Test - 2019.07.16 at 13h 23m 35s.xml">
       <configuration name="FitnessTest_M_Test" configurationId="JUnit" />
     </history-entry>
+    <history-entry file="FitnessTest_M_Test - 2019.07.16 at 16h 58m 53s.xml">
+      <configuration name="FitnessTest_M_Test" configurationId="JUnit" />
+    </history-entry>
+    <history-entry file="Quiz_SpielTest_main - 2019.07.16 at 17h 00m 28s.xml">
+      <configuration name="Quiz_SpielTest.main" configurationId="JUnit" />
+    </history-entry>
+    <history-entry file="Quiz_SpielTest_main - 2019.07.16 at 17h 00m 45s.xml">
+      <configuration name="Quiz_SpielTest.main" configurationId="JUnit" />
+    </history-entry>
+    <history-entry file="Quiz_SpielTest_main - 2019.07.16 at 17h 01m 07s.xml">
+      <configuration name="Quiz_SpielTest.main" configurationId="JUnit" />
+    </history-entry>
+    <history-entry file="Quiz_SpielTest_main - 2019.07.16 at 17h 01m 15s.xml">
+      <configuration name="Quiz_SpielTest.main" configurationId="JUnit" />
+    </history-entry>
+    <history-entry file="Quiz_SpielTest_main - 2019.07.16 at 17h 01m 43s.xml">
+      <configuration name="Quiz_SpielTest.main" configurationId="JUnit" />
+    </history-entry>
   </component>
   <component name="TimeTrackingManager">
-    <option name="totallyTimeSpent" value="46018000" />
+    <option name="totallyTimeSpent" value="48218000" />
   </component>
   <component name="ToolWindowManager">
-    <frame x="-8" y="-8" width="1936" height="1056" extended-state="6" />
+    <frame x="-8" y="-8" width="1616" height="886" extended-state="6" />
     <editor active="true" />
     <layout>
-      <window_info active="true" content_ui="combo" id="Project" order="0" visible="true" weight="0.17270789" />
+      <window_info content_ui="combo" id="Project" order="0" visible="true" weight="0.18059126" />
       <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="Messages" order="0" sideWeight="0.49573562" weight="0.3261105" />
+      <window_info anchor="bottom" id="Messages" order="0" sideWeight="0.4929306" weight="0.32536522" />
       <window_info anchor="bottom" id="Message" order="1" />
       <window_info anchor="bottom" id="Find" order="2" weight="0.3290461" />
-      <window_info anchor="bottom" id="Run" order="3" sideWeight="0.4978678" visible="true" weight="0.1744312" />
+      <window_info active="true" anchor="bottom" id="Run" order="3" sideWeight="0.49485862" visible="true" weight="0.17397079" />
       <window_info anchor="bottom" id="Debug" order="4" weight="0.3997344" />
       <window_info anchor="bottom" id="Cvs" order="5" weight="0.25" />
       <window_info anchor="bottom" id="Inspection" order="6" weight="0.4" />
       <window_info anchor="bottom" id="TODO" order="7" />
       <window_info anchor="bottom" id="Docker" order="8" show_stripe_button="false" />
-      <window_info anchor="bottom" id="Version Control" order="9" weight="0.3268206" />
+      <window_info anchor="bottom" id="Version Control" order="9" weight="0.32669324" />
       <window_info anchor="bottom" id="Database Changes" order="10" />
       <window_info anchor="bottom" id="Terminal" order="11" weight="0.3290461" />
-      <window_info anchor="bottom" id="Event Log" order="12" sideWeight="0.5021322" side_tool="true" visible="true" weight="0.1744312" />
+      <window_info anchor="bottom" id="Event Log" order="12" sideWeight="0.5051414" side_tool="true" weight="0.17397079" />
       <window_info anchor="bottom" id="Java Enterprise" order="13" />
       <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" />
@@ -572,10 +548,10 @@
       <window_info anchor="right" id="Theme Preview" order="4" />
       <window_info anchor="right" id="Capture Analysis" order="5" />
       <window_info anchor="right" id="Palette&#9;" order="6" />
-      <window_info anchor="right" id="Database" order="7" />
-      <window_info anchor="right" id="CDI" order="8" />
-      <window_info active="true" anchor="right" id="Coverage" order="9" side_tool="true" visible="true" weight="0.32995737" />
-      <window_info anchor="right" id="Maven" order="10" weight="0.32955465" />
+      <window_info anchor="right" id="CDI" order="7" />
+      <window_info active="true" anchor="right" id="Coverage" order="8" side_tool="true" visible="true" weight="0.32995737" />
+      <window_info anchor="right" id="Maven" order="9" weight="0.32955465" />
+      <window_info anchor="right" id="Database" order="10" weight="0.32969153" />
     </layout>
     <layout-to-restore>
       <window_info content_ui="combo" id="Project" order="0" visible="true" weight="0.14712153" />
@@ -615,6 +591,7 @@
     <option name="version" value="1" />
   </component>
   <component name="VcsManagerConfiguration">
+    <MESSAGE value="neue master" />
     <MESSAGE value="geburtstag sauber" />
     <MESSAGE value="Main bereinigt" />
     <MESSAGE value="junit klassen erst mal entfernen" />
@@ -637,12 +614,10 @@
     <MESSAGE value="Der siebte Commit. Weitere Testfälle." />
     <MESSAGE value="Der achte Commit. Neue Fitnessfragen sollen entworfen&#10;werden. Die Fragen (Labels) wurden erstellt und&#10;positioniert." />
     <MESSAGE value="Der neunte Commit. Textfelder zu den Fragen wurden eingefügt" />
-    <MESSAGE value="Commit #10. Bestätigungsbuttons eingefügt." />
-    <MESSAGE value="Commit #11. Erste Berechnungsfunktionen für das Gesammtergebnis erstellt." />
-    <MESSAGE value="Commit #12 (Wiederholungscommit). Der Fitnesstest ist im Grunde Fertig. Eine Gesammtpunktzahl wird nun berechnet, falls der Bmi und die Fragen bestätigt wurden." />
-    <option name="LAST_COMMIT_MESSAGE" value="Commit #12 (Wiederholungscommit). Der Fitnesstest ist im Grunde Fertig. Eine Gesammtpunktzahl wird nun berechnet, falls der Bmi und die Fragen bestätigt wurden." />
+    <option name="LAST_COMMIT_MESSAGE" value="Der neunte Commit. Textfelder zu den Fragen wurden eingefügt" />
   </component>
   <component name="com.intellij.coverage.CoverageDataManagerImpl">
+    <SUITE FILE_PATH="coverage/Alpha$Main.ic" NAME="Main Coverage Results" MODIFIED="1563287365466" SOURCE_PROVIDER="com.intellij.coverage.DefaultCoverageFileProvider" RUNNER="idea" COVERAGE_BY_TEST_ENABLED="false" COVERAGE_TRACING_ENABLED="false" />
     <SUITE FILE_PATH="coverage/Alpha_GOGS$Main.ic" NAME="Main Coverage Results" MODIFIED="1563229577210" SOURCE_PROVIDER="com.intellij.coverage.DefaultCoverageFileProvider" RUNNER="idea" COVERAGE_BY_TEST_ENABLED="false" COVERAGE_TRACING_ENABLED="false" />
   </component>
   <component name="editorHistoryManager">
@@ -683,80 +658,71 @@
     <entry file="file://$PROJECT_DIR$/src/bild.gif" />
     <entry file="file://$PROJECT_DIR$/src/bild1.jpg" />
     <entry file="file://$PROJECT_DIR$/src/bild2.jpg" />
-    <entry file="file://$PROJECT_DIR$/src/Quiz_Spiel.java">
+    <entry file="file://$PROJECT_DIR$/src/FitnessTest_M_Test.java" />
+    <entry file="file://$PROJECT_DIR$/src/Tage_D.java">
       <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="93">
-          <caret line="159" column="1" lean-forward="true" selection-start-line="159" selection-start-column="1" selection-end-line="163" selection-end-column="22" />
+        <state relative-caret-position="1435">
+          <caret line="94" lean-forward="true" selection-start-line="94" selection-end-line="94" />
+          <folding>
+            <element signature="imports" expanded="true" />
+          </folding>
         </state>
       </provider>
     </entry>
-    <entry file="file://$PROJECT_DIR$/src/Tage_DTest.java">
+    <entry file="file://$PROJECT_DIR$/src/FitnessTest_M.java">
       <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="238">
-          <caret line="18" column="5" selection-start-line="18" selection-start-column="5" selection-end-line="18" selection-end-column="5" />
+        <state relative-caret-position="452">
+          <caret line="318" lean-forward="true" selection-start-line="318" selection-end-line="318" />
+          <folding>
+            <element signature="imports" expanded="true" />
+          </folding>
         </state>
       </provider>
     </entry>
-    <entry file="file://$PROJECT_DIR$/src/Quiz_SpielTest.java">
+    <entry file="file://$PROJECT_DIR$/src/Quiz_SpielTest_2.java">
       <provider selected="true" editor-type-id="text-editor">
-        <state>
-          <caret column="35" selection-start-column="35" selection-end-column="35" />
+        <state relative-caret-position="34">
+          <caret line="4" column="6" selection-start-line="4" selection-start-column="6" selection-end-line="4" selection-end-column="6" />
         </state>
       </provider>
     </entry>
-    <entry file="file://$PROJECT_DIR$/src/Tage_D.java">
+    <entry file="file://$PROJECT_DIR$/src/Quiz_Spiel.java">
       <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="511">
-          <caret line="143" column="78" selection-start-line="143" selection-start-column="78" selection-end-line="143" selection-end-column="78" />
-          <folding>
-            <element signature="imports" expanded="true" />
-          </folding>
+        <state relative-caret-position="2635">
+          <caret line="159" lean-forward="true" selection-start-line="159" selection-end-line="164" selection-end-column="9" />
         </state>
       </provider>
     </entry>
-    <entry file="file://$PROJECT_DIR$/src/Main.java">
+    <entry file="file://$PROJECT_DIR$/src/Tage_DTest.java">
       <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="2465">
-          <caret line="149" selection-start-line="149" selection-end-line="149" />
+        <state relative-caret-position="306">
+          <caret line="18" column="5" selection-start-line="18" selection-start-column="5" selection-end-line="18" selection-end-column="5" />
           <folding>
             <element signature="imports" expanded="true" />
           </folding>
         </state>
       </provider>
     </entry>
-    <entry file="file://$PROJECT_DIR$/src/Quiz_SpielTest_2.java">
+    <entry file="file://$PROJECT_DIR$/src/Quiz_SpielTest.java">
       <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="34">
+        <state relative-caret-position="68">
           <caret line="4" column="6" selection-start-line="4" selection-start-column="6" selection-end-line="4" selection-end-column="6" />
-        </state>
-      </provider>
-    </entry>
-    <entry file="file://$PROJECT_DIR$/src/FitnessTest_M_Test.java">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="425">
-          <caret line="93" column="31" selection-start-line="93" selection-start-column="31" selection-end-line="93" selection-end-column="31" />
           <folding>
             <element signature="imports" expanded="true" />
-            <element signature="e#142#143#0" expanded="true" />
-            <element signature="e#192#193#0" expanded="true" />
           </folding>
         </state>
       </provider>
     </entry>
-    <entry file="file://$PROJECT_DIR$/src/FitnessTest_M.java">
+    <entry file="file://$PROJECT_DIR$/src/Main.java">
       <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="573">
-          <caret line="305" column="37" lean-forward="true" selection-start-line="305" selection-start-column="37" selection-end-line="305" selection-end-column="37" />
+        <state relative-caret-position="306">
+          <caret line="108" column="27" selection-start-line="108" selection-start-column="27" selection-end-line="108" selection-end-column="27" />
           <folding>
             <element signature="imports" expanded="true" />
-            <element signature="e#2063#2525#0" expanded="true" />
-            <element signature="e#2524#2525#0" expanded="true" />
-            <element signature="e#2877#3340#0" expanded="true" />
-            <element signature="e#3339#3340#0" expanded="true" />
-            <element signature="e#11696#11697#0" expanded="true" />
-            <element signature="e#11749#11750#0" expanded="true" />
-            <element signature="e#11808#11809#0" expanded="true" />
-            <element signature="e#11863#11864#0" expanded="true" />
+            <element signature="e#7514#7647#0" expanded="true" />
+            <element signature="e#7646#7647#0" expanded="true" />
+            <element signature="e#4970#4971#0" expanded="true" />
+            <element signature="e#5006#5007#0" expanded="true" />
           </folding>
         </state>
       </provider>
@@ -778,6 +744,7 @@
       </state>
       <state key="FacetStructureConfigurable.UI">
         <settings>
+          <last-edited>No facets are configured</last-edited>
           <splitter-proportions>
             <option name="proportions">
               <list>
@@ -800,6 +767,7 @@
       </state>
       <state key="JdkListConfigurable.UI">
         <settings>
+          <last-edited>1.8</last-edited>
           <splitter-proportions>
             <option name="proportions">
               <list>
@@ -816,6 +784,7 @@
             <option name="proportions">
               <list>
                 <option value="0.2" />
+                <option value="0.6" />
               </list>
             </option>
           </splitter-proportions>
@@ -823,6 +792,7 @@
       </state>
       <state key="ProjectLibrariesConfigurable.UI">
         <settings>
+          <last-edited>Maven: Arquillian JUnit:Release</last-edited>
           <splitter-proportions>
             <option name="proportions">
               <list>
diff --git a/Alpha.iml b/Alpha.iml
index a0088ce..e2425bc 100644
--- a/Alpha.iml
+++ b/Alpha.iml
@@ -44,7 +44,6 @@
     </orderEntry>
     <orderEntry type="library" name="Maven: Arquillian JUnit:Release" level="project" />
     <orderEntry type="library" name="Drools-6.2.0" level="project" />
-    <orderEntry type="library" name="Drools-6.2.0" level="project" />
     <orderEntry type="module-library" scope="TEST">
       <library name="JUnit5.3">
         <CLASSES>
diff --git a/src/FitnessTest_M_Test.java b/src/FitnessTest_M_Test.java
deleted file mode 100644
index f39c00d..0000000
--- a/src/FitnessTest_M_Test.java
+++ /dev/null
@@ -1,104 +0,0 @@
-import org.junit.Before;
-import org.junit.Test;
-
-import static org.hamcrest.MatcherAssert.assertThat;
-import static org.hamcrest.core.IsEqual.equalTo;
-
-public class FitnessTest_M_Test {
-    private FitnessTest_M fitnessTest_M;
-
-    @Before
-    public void setup() {
-        fitnessTest_M = new FitnessTest_M();
-    }
-
-    @Test
-    public void normalBmi() {
-        //arrange
-        FitnessTest_M fitnessTest_M = new FitnessTest_M();
-        float height = (float) 1.70;
-        float weight = 70;
-        int expectedResult = 24;
-
-        //act
-        int bmiResult = fitnessTest_M.calculateBmi(height, weight);
-
-        //assert
-        assertThat("", bmiResult, equalTo(expectedResult));
-    }
-
-    @Test
-    public void mediumBmi() {
-        //arrange
-        FitnessTest_M fitnessTest_M = new FitnessTest_M();
-        float height = (float) 1.80;
-        float weight = 90;
-        int expectedResult = 27;
-
-        //act
-        int bmiResult = fitnessTest_M.calculateBmi(height, weight);
-
-        //assert
-        assertThat("", bmiResult, equalTo(expectedResult));
-    }
-
-    @Test
-    public void heavyBmi() {
-        //arrange
-        FitnessTest_M fitnessTest_M = new FitnessTest_M();
-        float height = (float) 1.60;
-        float weight = 100;
-        int expectedResult = 39;
-
-        //act
-        int bmiResult = fitnessTest_M.calculateBmi(height, weight);
-
-        //assert
-        assertThat("", bmiResult, equalTo(expectedResult));
-    }
-
-    @Test
-    public void lightBmi() {
-        //arrange
-        FitnessTest_M fitnessTest_M = new FitnessTest_M();
-        float height = (float) 1.75;
-        float weight = 50;
-        int expectedResult = 16;
-
-        //act
-        int bmiResult = fitnessTest_M.calculateBmi(height, weight);
-
-        //assert
-        assertThat("", bmiResult, equalTo(expectedResult));
-    }
-
-    @Test
-    public void monsterBmi() {
-        //arrange
-        FitnessTest_M fitnessTest_M = new FitnessTest_M();
-        float height = (float) 3.70;
-        float weight = 3000;
-        int expectedResult = 219;
-
-        //act
-        int bmiResult = fitnessTest_M.calculateBmi(height, weight);
-
-        //assert
-        assertThat("", bmiResult, equalTo(expectedResult));
-    }
-
-    @Test
-    public void antBmi() {
-        //arrange
-        FitnessTest_M fitnessTest_M = new FitnessTest_M();
-        float height = (float) 0.20;
-        float weight = (float) 0.30;
-        int expectedResult = 7;
-
-        //act
-        int bmiResult = fitnessTest_M.calculateBmi(height, weight);
-
-        //assert
-        assertThat("", bmiResult, equalTo(expectedResult));
-    }
-}
diff --git a/src/Main.java b/src/Main.java
index 2976e22..4737088 100644
--- a/src/Main.java
+++ b/src/Main.java
@@ -1,6 +1,6 @@
 import javax.swing.*;
-import java.awt.*;
-import java.awt.event.*;
+        import java.awt.*;
+        import java.awt.event.*;
 public class Main {
     //Variablen GUI
 
@@ -17,7 +17,7 @@ public class Main {
     JMenu mF= null;
     JMenu mH = null;
     JMenu mI = null;
-    
+
     //Konstruktor Gui
     public Main(){
 
@@ -43,7 +43,6 @@ public class Main {
         menuItem2  = new JMenuItem("Exit");    mF.add(menuItem2);
         menuItem3  = new JMenuItem("Über");    mI.add(menuItem3);
 
-
         menuItem1.addActionListener(new ActionListener() {
             public void actionPerformed(ActionEvent ie) {
                 try {
@@ -55,7 +54,6 @@ public class Main {
                     mn.fr.setVisible(true);
                     //System.exit(0);
 
-
                 }catch (Exception ex) {
                     JOptionPane.showMessageDialog(null, "Fehler");
                 }
@@ -95,7 +93,7 @@ public class Main {
 
         JButton DTools = new JButton("Daniel");    DTools.setBounds(100, 100, 100, 40);
         buttonGroup.add(DTools);    Panele.add(DTools);
-        
+
         JButton ETools = new JButton("Eugen"); ETools.setBounds(200, 200, 100, 40);
         buttonGroup.add(ETools);  Panele.add(ETools);
 
@@ -106,9 +104,9 @@ public class Main {
             public void actionPerformed(ActionEvent ie) {
                 try {
 
-                    JOptionPane.showMessageDialog(fr, "Aufruf von Daniels Tools");
+                    JOptionPane.showMessageDialog(fr, "Aufruf von Daniel Tools");
                     fr.setVisible(false);
-                    Tage_D gb = new Tage_D();
+                    Tage_D tage = new Tage_D();
 
                 }catch (Exception ex) {
                     JOptionPane.showMessageDialog(null, "Fehler beim Aufruf von Daniels Tools");
@@ -136,12 +134,10 @@ public class Main {
         MTools.addActionListener(new ActionListener() {
             public void actionPerformed(ActionEvent ie) {
                 try {
-
                     JOptionPane.showMessageDialog(fr, "Aufruf von Michaels Tools");
                     fr.setVisible(false);
                     FitnessTest_M M = new FitnessTest_M();
 
-
                 }catch (Exception ex) {
                     JOptionPane.showMessageDialog(null, "Fehler beim Aufruf von Michaels Tools");
                 }
@@ -155,6 +151,5 @@ public class Main {
 
     public static void main(String[] args) {
         Main mn = new Main();
-
     }
 }
\ No newline at end of file
diff --git a/src/Tage_D.java b/src/Tage_D.java
index f7f9769..dcb8cc8 100644
--- a/src/Tage_D.java
+++ b/src/Tage_D.java
@@ -1,12 +1,11 @@
+import javax.swing.*;
 import java.awt.*;
 import java.awt.event.ActionEvent;
 import java.awt.event.ActionListener;
-import javax.swing.JOptionPane;
-import javax.swing.*;
 import java.awt.event.WindowAdapter;
 import java.awt.event.WindowEvent;
-import java.util.Random;
 import java.util.Date;
+import java.util.Random;
 
 public class Tage_D extends JFrame {