diff --git a/.idea/modules.xml b/.idea/modules.xml
deleted file mode 100644
index 20be1f8..0000000
--- a/.idea/modules.xml
+++ /dev/null
@@ -1,8 +0,0 @@
-
-
-
-
-
-
-
-
\ No newline at end of file
diff --git a/.idea/vcs.xml b/.idea/vcs.xml
deleted file mode 100644
index 35eb1dd..0000000
--- a/.idea/vcs.xml
+++ /dev/null
@@ -1,6 +0,0 @@
-
-
-
-
-
-
\ No newline at end of file
diff --git a/M1/.idea/.gitignore b/M1/.idea/.gitignore
deleted file mode 100644
index 13566b8..0000000
--- a/M1/.idea/.gitignore
+++ /dev/null
@@ -1,8 +0,0 @@
-# Default ignored files
-/shelf/
-/workspace.xml
-# Editor-based HTTP Client requests
-/httpRequests/
-# Datasource local storage ignored files
-/dataSources/
-/dataSources.local.xml
diff --git a/M1/.idea/M1.iml b/M1/.idea/M1.iml
deleted file mode 100644
index c956989..0000000
--- a/M1/.idea/M1.iml
+++ /dev/null
@@ -1,8 +0,0 @@
-
-
-
-
-
-
-
-
\ No newline at end of file
diff --git a/M1/.idea/php.xml b/M1/.idea/php.xml
deleted file mode 100644
index f324872..0000000
--- a/M1/.idea/php.xml
+++ /dev/null
@@ -1,19 +0,0 @@
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
\ No newline at end of file
diff --git a/M2/.idea/.gitignore b/M2/.idea/.gitignore
deleted file mode 100644
index 13566b8..0000000
--- a/M2/.idea/.gitignore
+++ /dev/null
@@ -1,8 +0,0 @@
-# Default ignored files
-/shelf/
-/workspace.xml
-# Editor-based HTTP Client requests
-/httpRequests/
-# Datasource local storage ignored files
-/dataSources/
-/dataSources.local.xml
diff --git a/M2/.idea/shelf/Uncommitted_changes_before_Checkout_at_15_11_2023_12_24_[Changes]/shelved.patch b/M2/.idea/shelf/Uncommitted_changes_before_Checkout_at_15_11_2023_12_24_[Changes]/shelved.patch
new file mode 100644
index 0000000..58aeb50
--- /dev/null
+++ b/M2/.idea/shelf/Uncommitted_changes_before_Checkout_at_15_11_2023_12_24_[Changes]/shelved.patch
@@ -0,0 +1,210 @@
+Index: ../M1/.idea/vcs.xml
+===================================================================
+diff --git a/../M1/.idea/vcs.xml b/../M1/.idea/vcs.xml
+deleted file mode 100644
+--- a/../M1/.idea/vcs.xml (revision 1b5faa0d69e292e2649269e271b773eaad28f5d1)
++++ /dev/null (revision 1b5faa0d69e292e2649269e271b773eaad28f5d1)
+@@ -1,6 +0,0 @@
+-
+-
+-
+-
+-
+-
+\ No newline at end of file
+Index: ../M1/.idea/.gitignore
+===================================================================
+diff --git a/../M1/.idea/.gitignore b/../M1/.idea/.gitignore
+deleted file mode 100644
+--- a/../M1/.idea/.gitignore (revision 1b5faa0d69e292e2649269e271b773eaad28f5d1)
++++ /dev/null (revision 1b5faa0d69e292e2649269e271b773eaad28f5d1)
+@@ -1,8 +0,0 @@
+-# Default ignored files
+-/shelf/
+-/workspace.xml
+-# Editor-based HTTP Client requests
+-/httpRequests/
+-# Datasource local storage ignored files
+-/dataSources/
+-/dataSources.local.xml
+Index: ../.idea/modules.xml
+===================================================================
+diff --git a/../.idea/modules.xml b/../.idea/modules.xml
+deleted file mode 100644
+--- a/../.idea/modules.xml (revision 1b5faa0d69e292e2649269e271b773eaad28f5d1)
++++ /dev/null (revision 1b5faa0d69e292e2649269e271b773eaad28f5d1)
+@@ -1,8 +0,0 @@
+-
+-
+-
+-
+-
+-
+-
+-
+\ No newline at end of file
+Index: ../M1/.idea/M1.iml
+===================================================================
+diff --git a/../M1/.idea/M1.iml b/../M1/.idea/M1.iml
+deleted file mode 100644
+--- a/../M1/.idea/M1.iml (revision 1b5faa0d69e292e2649269e271b773eaad28f5d1)
++++ /dev/null (revision 1b5faa0d69e292e2649269e271b773eaad28f5d1)
+@@ -1,8 +0,0 @@
+-
+-
+-
+-
+-
+-
+-
+-
+\ No newline at end of file
+Index: ../.idea/php.xml
+===================================================================
+diff --git a/../.idea/php.xml b/../.idea/php.xml
+deleted file mode 100644
+--- a/../.idea/php.xml (revision 1b5faa0d69e292e2649269e271b773eaad28f5d1)
++++ /dev/null (revision 1b5faa0d69e292e2649269e271b773eaad28f5d1)
+@@ -1,20 +0,0 @@
+-
+-
+-
+-
+-
+-
+-
+-
+-
+-
+-
+-
+-
+-
+-
+-
+-
+-
+-
+-
+\ No newline at end of file
+Index: ../.idea/DBWT-Praktika.iml
+===================================================================
+diff --git a/../.idea/DBWT-Praktika.iml b/../.idea/DBWT-Praktika.iml
+deleted file mode 100644
+--- a/../.idea/DBWT-Praktika.iml (revision 1b5faa0d69e292e2649269e271b773eaad28f5d1)
++++ /dev/null (revision 1b5faa0d69e292e2649269e271b773eaad28f5d1)
+@@ -1,8 +0,0 @@
+-
+-
+-
+-
+-
+-
+-
+-
+\ No newline at end of file
+Index: ../M1/.idea/php.xml
+===================================================================
+diff --git a/../M1/.idea/php.xml b/../M1/.idea/php.xml
+deleted file mode 100644
+--- a/../M1/.idea/php.xml (revision 1b5faa0d69e292e2649269e271b773eaad28f5d1)
++++ /dev/null (revision 1b5faa0d69e292e2649269e271b773eaad28f5d1)
+@@ -1,19 +0,0 @@
+-
+-
+-
+-
+-
+-
+-
+-
+-
+-
+-
+-
+-
+-
+-
+-
+-
+-
+-
+\ No newline at end of file
+Index: ../.idea/.gitignore
+===================================================================
+diff --git a/../.idea/.gitignore b/../.idea/.gitignore
+deleted file mode 100644
+--- a/../.idea/.gitignore (revision 1b5faa0d69e292e2649269e271b773eaad28f5d1)
++++ /dev/null (revision 1b5faa0d69e292e2649269e271b773eaad28f5d1)
+@@ -1,8 +0,0 @@
+-# Default ignored files
+-/shelf/
+-/workspace.xml
+-# Editor-based HTTP Client requests
+-/httpRequests/
+-# Datasource local storage ignored files
+-/dataSources/
+-/dataSources.local.xml
+Index: .idea/.gitignore
+===================================================================
+diff --git a/.idea/.gitignore b/.idea/.gitignore
+deleted file mode 100644
+--- a/.idea/.gitignore (revision 1b5faa0d69e292e2649269e271b773eaad28f5d1)
++++ /dev/null (revision 1b5faa0d69e292e2649269e271b773eaad28f5d1)
+@@ -1,8 +0,0 @@
+-# Default ignored files
+-/shelf/
+-/workspace.xml
+-# Editor-based HTTP Client requests
+-/httpRequests/
+-# Datasource local storage ignored files
+-/dataSources/
+-/dataSources.local.xml
+Index: ../M1/.idea/modules.xml
+===================================================================
+diff --git a/../M1/.idea/modules.xml b/../M1/.idea/modules.xml
+deleted file mode 100644
+--- a/../M1/.idea/modules.xml (revision 1b5faa0d69e292e2649269e271b773eaad28f5d1)
++++ /dev/null (revision 1b5faa0d69e292e2649269e271b773eaad28f5d1)
+@@ -1,8 +0,0 @@
+-
+-
+-
+-
+-
+-
+-
+-
+\ No newline at end of file
+Index: ../.idea/vcs.xml
+===================================================================
+diff --git a/../.idea/vcs.xml b/../.idea/vcs.xml
+deleted file mode 100644
+--- a/../.idea/vcs.xml (revision 1b5faa0d69e292e2649269e271b773eaad28f5d1)
++++ /dev/null (revision 1b5faa0d69e292e2649269e271b773eaad28f5d1)
+@@ -1,6 +0,0 @@
+-
+-
+-
+-
+-
+-
+\ No newline at end of file
+Index: .idea/php.xml
+IDEA additional info:
+Subsystem: com.intellij.openapi.diff.impl.patch.BaseRevisionTextPatchEP
+<+>\r\n\r\n \r\n \r\n \r\n \r\n \r\n \r\n \r\n \r\n \r\n \r\n \r\n \r\n \r\n \r\n \r\n \r\n \r\n
+Subsystem: com.intellij.openapi.diff.impl.patch.CharsetEP
+<+>UTF-8
+===================================================================
+diff --git a/.idea/php.xml b/.idea/php.xml
+--- a/.idea/php.xml (revision 1b5faa0d69e292e2649269e271b773eaad28f5d1)
++++ b/.idea/php.xml (date 1700047317911)
+@@ -10,7 +10,6 @@
+
+
+
+-
+
+
+
diff --git a/M2/.idea/shelf/Uncommitted_changes_before_Checkout_at_15_11_2023_12_24__Changes_.xml b/M2/.idea/shelf/Uncommitted_changes_before_Checkout_at_15_11_2023_12_24__Changes_.xml
new file mode 100644
index 0000000..e708911
--- /dev/null
+++ b/M2/.idea/shelf/Uncommitted_changes_before_Checkout_at_15_11_2023_12_24__Changes_.xml
@@ -0,0 +1,4 @@
+
+
+
+
\ No newline at end of file
diff --git a/M2/.idea/workspace.xml b/M2/.idea/workspace.xml
new file mode 100644
index 0000000..df7c8b2
--- /dev/null
+++ b/M2/.idea/workspace.xml
@@ -0,0 +1,74 @@
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ {
+ "associatedIndex": 8
+}
+
+
+
+
+
+
+
+
+
+
+ 1700047295160
+
+
+ 1700047295160
+
+
+
+
+
+
+
+
+
\ No newline at end of file
diff --git a/.idea/.gitignore b/M3/.idea/.gitignore
similarity index 100%
rename from .idea/.gitignore
rename to M3/.idea/.gitignore
diff --git a/.idea/DBWT-Praktika.iml b/M3/.idea/M3.iml
similarity index 100%
rename from .idea/DBWT-Praktika.iml
rename to M3/.idea/M3.iml
diff --git a/M3/.idea/dataSources.xml b/M3/.idea/dataSources.xml
new file mode 100644
index 0000000..0c10b1c
--- /dev/null
+++ b/M3/.idea/dataSources.xml
@@ -0,0 +1,12 @@
+
+
+
+
+ mariadb
+ true
+ org.mariadb.jdbc.Driver
+ jdbc:mariadb://localhost:3306
+ $ProjectFileDir$
+
+
+
\ No newline at end of file
diff --git a/M1/.idea/modules.xml b/M3/.idea/modules.xml
similarity index 61%
rename from M1/.idea/modules.xml
rename to M3/.idea/modules.xml
index 4c5db81..b512faf 100644
--- a/M1/.idea/modules.xml
+++ b/M3/.idea/modules.xml
@@ -2,7 +2,7 @@
-
+
\ No newline at end of file
diff --git a/.idea/php.xml b/M3/.idea/php.xml
similarity index 100%
rename from .idea/php.xml
rename to M3/.idea/php.xml
diff --git a/M3/.idea/sqldialects.xml b/M3/.idea/sqldialects.xml
new file mode 100644
index 0000000..68f10cb
--- /dev/null
+++ b/M3/.idea/sqldialects.xml
@@ -0,0 +1,7 @@
+
+
+
+
+
+
+
\ No newline at end of file
diff --git a/M1/.idea/vcs.xml b/M3/.idea/vcs.xml
similarity index 100%
rename from M1/.idea/vcs.xml
rename to M3/.idea/vcs.xml
diff --git a/M3/M3.pdf b/M3/M3.pdf
new file mode 100644
index 0000000..dc09860
Binary files /dev/null and b/M3/M3.pdf differ
diff --git a/M3/werbeseite_daten.sql b/M3/werbeseite_daten.sql
new file mode 100644
index 0000000..44d088d
--- /dev/null
+++ b/M3/werbeseite_daten.sql
@@ -0,0 +1,93 @@
+
+USE emensawerbeseite;
+
+INSERT INTO `allergen` (`code`, `name`, `typ`) VALUES
+ ('a', 'Getreideprodukte', 'Getreide (Gluten)'),
+ ('a1', 'Weizen', 'Allergen'),
+ ('a2', 'Roggen', 'Allergen'),
+ ('a3', 'Gerste', 'Allergen'),
+ ('a4', 'Dinkel', 'Allergen'),
+ ('a5', 'Hafer', 'Allergen'),
+ ('a6', 'Dinkel', 'Allergen'),
+ ('b', 'Fisch', 'Allergen'),
+ ('c', 'Krebstiere', 'Allergen'),
+ ('d', 'Schwefeldioxid/Sulfit', 'Allergen'),
+ ('e', 'Sellerie', 'Allergen'),
+ ('f', 'Milch und Laktose', 'Allergen'),
+ ('f1', 'Butter', 'Allergen'),
+ ('f2', 'Käse', 'Allergen'),
+ ('f3', 'Margarine', 'Allergen'),
+ ('g', 'Sesam', 'Allergen'),
+ ('h', 'Nüsse', 'Allergen'),
+ ('h1', 'Mandeln', 'Allergen'),
+ ('h2', 'Haselnüsse', 'Allergen'),
+ ('h3', 'Walnüsse', 'Allergen'),
+ ('i', 'Erdnüsse', 'Allergen');
+
+INSERT INTO `gericht` (`id`, `name`, `beschreibung`, `erfasst_am`, `vegan`, `vegetarisch`, `preisintern`, `preisextern`) VALUES
+ (1, 'Bratkartoffeln mit Speck und Zwiebeln', 'Kartoffeln mit Zwiebeln und gut Speck', '2020-08-25', 0, 0, 2.3, 4),
+ (3, 'Bratkartoffeln mit Zwiebeln', 'Kartoffeln mit Zwiebeln und ohne Speck', '2020-08-25', 1, 1, 2.3, 4),
+ (4, 'Grilltofu', 'Fein gewürzt und mariniert', '2020-08-25', 1, 1, 2.5, 4.5),
+ (5, 'Lasagne', 'Klassisch mit Bolognesesoße und Creme Fraiche', '2020-08-24', 0, 0, 2.5, 4.5),
+ (6, 'Lasagne vegetarisch', 'Klassisch mit Sojagranulatsoße und Creme Fraiche', '2020-08-24', 0, 1, 2.5, 4.5),
+ (7, 'Hackbraten', 'Nicht nur für Hacker', '2020-08-25', 0, 0, 2.5, 4),
+ (8, 'Gemüsepfanne', 'Gesundes aus der Region, deftig angebraten', '2020-08-25', 1, 1, 2.3, 4),
+ (9, 'Hühnersuppe', 'Suppenhuhn trifft Petersilie', '2020-08-25', 0, 0, 2, 3.5),
+ (10, 'Forellenfilet', 'mit Kartoffeln und Dilldip', '2020-08-22', 0, 0, 3.8, 5),
+ (11, 'Kartoffel-Lauch-Suppe', 'der klassische Bauchwärmer mit frischen Kräutern', '2020-08-22', 0, 1, 2, 3),
+ (12, 'Kassler mit Rosmarinkartoffeln', 'dazu Salat und Senf', '2020-08-23', 0, 0, 3.8, 5.2),
+ (13, 'Drei Reibekuchen mit Apfelmus', 'grob geriebene Kartoffeln aus der Region', '2020-08-23', 0, 1, 2.5, 4.5),
+ (14, 'Pilzpfanne', 'die legendäre Pfanne aus Pilzen der Saison', '2020-08-23', 0, 1, 3, 5),
+ (15, 'Pilzpfanne vegan', 'die legendäre Pfanne aus Pilzen der Saison ohne Käse', '2020-08-24', 1, 1, 3, 5),
+ (16, 'Käsebrötchen', 'schmeckt vor und nach dem Essen', '2020-08-24', 0, 1, 1, 1.5),
+ (17, 'Schinkenbrötchen', 'schmeckt auch ohne Hunger', '2020-08-25', 0, 0, 1.25, 1.75),
+ (18, 'Tomatenbrötchen', 'mit Schnittlauch und Zwiebeln', '2020-08-25', 1, 1, 1, 1.5),
+ (19, 'Mousse au Chocolat', 'sahnige schweizer Schokolade rundet jedes Essen ab', '2020-08-26', 0, 1, 1.25, 1.75),
+ (20, 'Suppenkreation á la Chef', 'was verschafft werden muss, gut und günstig', '2020-08-26', 0, 0, 0.5, 0.9);
+
+INSERT INTO `gericht_hat_allergen` (`code`, `gericht_id`) VALUES
+ ('h', 1),
+ ('a3', 1),
+ ('a4', 1),
+ ('f1', 3),
+ ('a6', 3),
+ ('i', 3),
+ ('a3', 4),
+ ('f1', 4),
+ ('a4', 4),
+ ('h3', 4),
+ ('d', 6),
+ ('h1',7),
+ ('a2', 7),
+ ('h3', 7),
+ ('c', 7),
+ ('a3', 8),
+ ('h3', 10),
+ ('d', 10),
+ ('f', 10),
+ ('f2', 12),
+ ('h1', 12),
+ ('a5',12),
+ ('c', 1),
+ ('a2', 9),
+ ('i', 14),
+ ('f1', 1),
+ ('a1', 15),
+ ('a4', 15),
+ ('i', 15),
+ ('f3', 15),
+ ('h3', 15);
+
+INSERT INTO `kategorie` (`id`, `eltern_id`, `name`, `bildname`) VALUES
+ (1, NULL, 'Aktionen', 'kat_aktionen.png'),
+ (2, NULL, 'Menus', 'kat_menu.gif'),
+ (3, 2, 'Hauptspeisen', 'kat_menu_haupt.bmp'),
+ (4, 2, 'Vorspeisen', 'kat_menu_vor.svg'),
+ (5, 2, 'Desserts', 'kat_menu_dessert.pic'),
+ (6, 1, 'Mensastars', 'kat_stars.tif'),
+ (7, 1, 'Erstiewoche', 'kat_erties.jpg');
+
+INSERT INTO `gericht_hat_kategorie` (`kategorie_id`, `gericht_id`) VALUES
+ (3, 1), (3, 3), (3, 4), (3, 5), (3, 6), (3, 7), (3, 9), (4, 16), (4, 17), (4, 18), (5, 16), (5, 17), (5, 18);
+
+