diff --git a/.gitmodules b/.gitmodules
index a53596f..a5a3134 100644
--- a/.gitmodules
+++ b/.gitmodules
@@ -1,6 +1,15 @@
-[submodule "homepage/materialize"]
-	path = homepage/materialize
-	url = https://github.com/materializecss/materialize.git
-[submodule "homepage/redesign2018/markdownExperiment/zopfli"]
-	path = homepage/redesign2018/markdownExperiment/zopfli
+[submodule "submodules/zopfli"]
+	path = submodules/zopfli
 	url = https://github.com/google/zopfli.git
+[submodule "submodules/parsedown"]
+	path = submodules/parsedown
+	url = https://github.com/erusev/parsedown
+[submodule "submodules/spyc"]
+	path = submodules/spyc
+	url = https://github.com/mustangostang/spyc.git
+[submodule "submodules/lite-youtube-embed"]
+	path = submodules/lite-youtube-embed
+	url = https://github.com/paulirish/lite-youtube-embed.git
+[submodule "submodules/materialize"]
+	path = submodules/materialize
+	url = https://github.com/materializecss/materialize.git
diff --git a/DieJudoGürtelprüfung/.htaccess b/DieJudoGürtelprüfung/.htaccess
new file mode 100644
index 0000000..80d6edc
--- /dev/null
+++ b/DieJudoGürtelprüfung/.htaccess
@@ -0,0 +1,6 @@
+RewriteEngine On
+RewriteBase /
+
+RewriteCond %{REQUEST_FILENAME} !-d
+RewriteCond %{REQUEST_FILENAME}\.php -f
+RewriteRule ^(.+)$ $1.php [L]
diff --git a/DieJudoGürtelprüfung/Kyu5.json b/DieJudoGürtelprüfung/Kyu5.json
new file mode 100644
index 0000000..d78d853
--- /dev/null
+++ b/DieJudoGürtelprüfung/Kyu5.json
@@ -0,0 +1,74 @@
+[
+    {
+        "source": "http://mmurl.de/judo52",
+        "target": "videos/5terKyu/Ukemi/MaeMawari.webm"
+    },
+    {
+        "source": "http://mmurl.de/judo53",
+        "target": "videos/5terKyu/NageWaza/MoroteSeoiNage.webm"
+    },
+    {
+        "source": "http://mmurl.de/judo54",
+        "target": "videos/5terKyu/NageWaza/SasaeTsuriKomiAshiHizaGuruma.webm"
+    },
+    {
+        "source": "http://mmurl.de/judo55",
+        "target": "videos/5terKyu/NageWaza/OkuriAshiBarei.webm"
+    },
+    {
+        "source": "http://mmurl.de/judo56",
+        "target": "videos/5terKyu/NageWaza/OSotoGari.webm"
+    },
+    {
+        "source": "http://mmurl.de/judo57",
+        "target": "videos/5terKyu/NageWaza/HaraiGoshi.webm"
+    },
+    {
+        "source": "http://mmurl.de/judo58",
+        "target": "videos/5terKyu/KansetsuWaza/JujiGatame.webm"
+    },
+    {
+        "source": "http://mmurl.de/judo59",
+        "target": "videos/5terKyu/KansetsuWaza/UdeGarami.webm"
+    },
+    {
+        "source": "http://mmurl.de/judo60",
+        "target": "videos/5terKyu/TachiWaza/KonterEindreh.webm"
+    },
+    {
+        "source": "http://mmurl.de/judo61",
+        "target": "videos/5terKyu/TachiWaza/KonterFuss.webm"
+    },
+    {
+        "source": "http://mmurl.de/judo62",
+        "target": "videos/5terKyu/TachiWaza/KombiEindreh.webm"
+    },
+    {
+        "source": "http://mmurl.de/judo63",
+        "target": "videos/5terKyu/TachiWaza/KombiFuss.webm"
+    },
+    {
+        "source": "http://mmurl.de/judo64",
+        "target": "videos/5terKyu/NeWaza/UkesBefreiungZuJujiGatame.webm"
+    },
+    {
+        "source": "http://mmurl.de/judo65",
+        "target": "videos/5terKyu/NeWaza/UkesBefreiungZuUdeGarami.webm"
+    },
+    {
+        "source": "http://mmurl.de/judo66",
+        "target": "videos/5terKyu/NeWaza/BefreiungDurchBeinklammer.webm"
+    },
+    {
+        "source": "http://mmurl.de/judo67",
+        "target": "videos/5terKyu/NeWaza/BefreiungAusBeinklammer.webm"
+    },
+    {
+        "source": "http://mmurl.de/judo68",
+        "target": "videos/5terKyu/NeWaza/JujiGgBank.webm"
+    },
+    {
+        "source": "http://mmurl.de/judo69",
+        "target": "videos/5terKyu/Randori/Randori.webm"
+    }
+]
\ No newline at end of file
diff --git a/DieJudoGürtelprüfung/Kyu6.json b/DieJudoGürtelprüfung/Kyu6.json
new file mode 100644
index 0000000..e230e38
--- /dev/null
+++ b/DieJudoGürtelprüfung/Kyu6.json
@@ -0,0 +1,82 @@
+[
+    {
+        "source": "http://mmurl.de/judo32",
+        "target": "videos/6terKyu/Ukemi/MaeMawariUkemi.webm"
+    },
+    {
+        "source": "http://mmurl.de/judo33",
+        "target": "videos/6terKyu/NageWaza/IpponSeoiNage.webm"
+    },
+    {
+        "source": "http://mmurl.de/judo34",
+        "target": "videos/6terKyu/NageWaza/TaiOtoshi.webm"
+    },
+    {
+        "source": "http://mmurl.de/judo35",
+        "target": "videos/6terKyu/NageWaza/KoUchiGari.webm"
+    },
+    {
+        "source": "http://mmurl.de/judo36",
+        "target": "videos/6terKyu/NageWaza/KoSotoGakeKoSotoGake.webm"
+    },
+    {
+        "source": "http://mmurl.de/judo37",
+        "target": "videos/6terKyu/NageWaza/DeAshiBarei.webm"
+    },
+    {
+        "source": "http://mmurl.de/judo38",
+        "target": "videos/6terKyu/NeWaza/KesaGatame.webm"
+    },
+    {
+        "source": "http://mmurl.de/judo39",
+        "target": "videos/6terKyu/NeWaza/YokoShioGatame.webm"
+    },
+    {
+        "source": "http://mmurl.de/judo40",
+        "target": "videos/6terKyu/NeWaza/TateShioGatame.webm"
+    },
+    {
+        "source": "http://mmurl.de/judo41",
+        "target": "videos/6terKyu/NeWaza/KamiShioGatame.webm"
+    },
+    {
+        "source": "http://mmurl.de/judo42",
+        "target": "videos/6terKyu/AnwendungTachiWaza/IpponSeoiNage.webm"
+    },
+    {
+        "source": "http://mmurl.de/judo43",
+        "target": "videos/6terKyu/AnwendungTachiWaza/TaiOtoshi.webm"
+    },
+    {
+        "source": "http://mmurl.de/judo44",
+        "target": "videos/6terKyu/AnwendungTachiWaza/KoUchiGari.webm"
+    },
+    {
+        "source": "http://mmurl.de/judo45",
+        "target": "videos/6terKyu/AnwendungTachiWaza/DeAshiBarei.webm"
+    },
+    {
+        "source": "http://mmurl.de/judo46",
+        "target": "videos/6terKyu/AnwendungTachiWaza/Ausweichen.webm"
+    },
+    {
+        "source": "http://mmurl.de/judo47",
+        "target": "videos/6terKyu/AnwendungNeWaza/OUchiGari.webm"
+    },
+    {
+        "source": "http://mmurl.de/judo48",
+        "target": "videos/6terKyu/AnwendungNeWaza/KoUchiGari.webm"
+    },
+    {
+        "source": "http://mmurl.de/judo49",
+        "target": "videos/6terKyu/AnwendungNeWaza/Befreiungsprinzipien.webm"
+    },
+    {
+        "source": "http://mmurl.de/judo50",
+        "target": "videos/6terKyu/AnwendungNeWaza/AngriffOberlage.webm"
+    },
+    {
+        "source": "http://mmurl.de/judo51",
+        "target": "videos/6terKyu/AnwendungNeWaza/AngriffUnterlage.webm"
+    }
+]
\ No newline at end of file
diff --git a/DieJudoGürtelprüfung/Kyu7.json b/DieJudoGürtelprüfung/Kyu7.json
new file mode 100644
index 0000000..9e7f147
--- /dev/null
+++ b/DieJudoGürtelprüfung/Kyu7.json
@@ -0,0 +1,78 @@
+[
+    {
+        "source": "http://mmurl.de/judo13",
+        "target": "videos/7terKyu/Ukemi/MaeMawari.webm"
+    },
+    {
+        "source": "http://mmurl.de/judo14",
+        "target": "videos/7terKyu/NageWaza/OGoshi.webm"
+    },
+    {
+        "source": "http://mmurl.de/judo15",
+        "target": "videos/7terKyu/NageWaza/UkiGoshi.webm"
+    },
+    {
+        "source": "http://mmurl.de/judo16",
+        "target": "videos/7terKyu/NageWaza/OUchiGari.webm"
+    },
+    {
+        "source": "http://mmurl.de/judo17",
+        "target": "videos/7terKyu/NageWaza/SeoiOtoshi.webm"
+    },
+    {
+        "source": "http://mmurl.de/judo18",
+        "target": "videos/7terKyu/OsaeKomiWaza/KesaGatame.webm"
+    },
+    {
+        "source": "http://mmurl.de/judo19",
+        "target": "videos/7terKyu/OsaeKomiWaza/YokoShioGatame.webm"
+    },
+    {
+        "source": "http://mmurl.de/judo20",
+        "target": "videos/7terKyu/OsaeKomiWaza/TateShioGatame.webm"
+    },
+    {
+        "source": "http://mmurl.de/judo21",
+        "target": "videos/7terKyu/OsaeKomiWaza/KamiShioGatame.webm"
+    },
+    {
+        "source": "http://mmurl.de/judo22",
+        "target": "videos/7terKyu/TachiWaza/SeoiOtoshi.webm"
+    },
+    {
+        "source": "http://mmurl.de/judo23",
+        "target": "videos/7terKyu/TachiWaza/OUchiGari.webm"
+    },
+    {
+        "source": "http://mmurl.de/judo24",
+        "target": "videos/7terKyu/NeWaza/KesaGatame-Befreiung.webm"
+    },
+    {
+        "source": "http://mmurl.de/judo25",
+        "target": "videos/7terKyu/NeWaza/YokoShioGatame-Befreiung.webm"
+    },
+    {
+        "source": "http://mmurl.de/judo26",
+        "target": "videos/7terKyu/NeWaza/TateShioGatame-Befreiung.webm"
+    },
+    {
+        "source": "http://mmurl.de/judo27",
+        "target": "videos/7terKyu/NeWaza/KamiShioGatame-Befreiung.webm"
+    },
+    {
+        "source": "http://mmurl.de/judo28",
+        "target": "videos/7terKyu/NeWaza/AngriffGgBank.webm"
+    },
+    {
+        "source": "http://mmurl.de/judo29",
+        "target": "videos/7terKyu/NeWaza/AngriffGgBauch.webm"
+    },
+    {
+        "source": "http://mmurl.de/judo30",
+        "target": "videos/7terKyu/NeWaza/Haltegriffwechsel.webm"
+    },
+    {
+        "source": "http://mmurl.de/judo31",
+        "target": "videos/7terKyu/Randori/Randori.webm"
+    }
+]
diff --git a/DieJudoGürtelprüfung/Kyu8.json b/DieJudoGürtelprüfung/Kyu8.json
new file mode 100644
index 0000000..f39afe6
--- /dev/null
+++ b/DieJudoGürtelprüfung/Kyu8.json
@@ -0,0 +1,50 @@
+[
+    {
+        "source": "http://download.m-m-sports.com/extras/judo_guertelpruefung/1_8%20fallrw.mp4",
+        "target": "videos/8terKyu/Ukemi/Ushiro.webm"
+    },
+    {
+        "source": "http://mmurl.de/judo02",
+        "target": "videos/8terKyu/Ukemi/Yoko.webm"
+    },
+    {
+        "source": "http://mmurl.de/judo03",
+        "target": "videos/8terKyu/NageWaza/OGoshiUkiGoshi.webm"
+    },
+    {
+        "source": "http://mmurl.de/judo04",
+        "target": "videos/8terKyu/NageWaza/BeidbeinigeEindrehtechnik.webm"
+    },
+    {
+        "source": "http://mmurl.de/judo05",
+        "target": "videos/8terKyu/NageWaza/OSotoOtoshi.webm"
+    },
+    {
+        "source": "http://mmurl.de/judo06",
+        "target": "videos/8terKyu/OsaeKomiWaza/KesaGatame.webm"
+    },
+    {
+        "source": "http://mmurl.de/judo07",
+        "target": "videos/8terKyu/OsaeKomiWaza/MuneGatame.webm"
+    },
+    {
+        "source": "http://mmurl.de/judo08",
+        "target": "videos/8terKyu/TachiWaza/EindrehtechnikUkeSchiebt.webm"
+    },
+    {
+        "source": "http://mmurl.de/judo09",
+        "target": "videos/8terKyu/TachiWaza/OSotoOtoshiUkeZieht.webm"
+    },
+    {
+        "source": "http://mmurl.de/judo10",
+        "target": "videos/8terKyu/TachiWaza/UebergangStandBoden.webm"
+    },
+    {
+        "source": "http://mmurl.de/judo11",
+        "target": "videos/8terKyu/NeWaza/BefreiungOsaeKomi.webm"
+    },
+    {
+        "source": "http://mmurl.de/judo12",
+        "target": "videos/8terKyu/Randori/Randori.webm"
+    }
+]
\ No newline at end of file
diff --git a/DieJudoGürtelprüfung/Makefile b/DieJudoGürtelprüfung/Makefile
new file mode 100644
index 0000000..6e97671
--- /dev/null
+++ b/DieJudoGürtelprüfung/Makefile
@@ -0,0 +1,73 @@
+kyu8-sourceFiles = \
+	kyu8-Grundform-Wurftechniken.md \
+	kyu8-Grundform-Bodentechniken.md \
+	kyu8-Anwendungsaufgaben-Stand.md \
+	kyu8-Anwendungsaufgaben-Boden.md \
+	kyu8-BodenRandoriNachWurf.md \
+	kyu8-Lexikon.md \
+
+kyu7-sourceFiles = \
+	kyu7-Grundform-Wurftechniken.md \
+	kyu7-Grundform-Bodentechniken.md \
+	kyu7-Anwendungsaufgaben-Stand.md \
+	kyu7-Anwendungsaufgaben-Boden.md \
+	kyu7-BodenRandoriNachWurf.md \
+	kyu7-Lexikon.md \
+
+kyu6-sourceFiles = \
+	Kyu6.md \
+	Kyu6-Ukemi.md \
+	Kyu6-NageWaza.md \
+	Kyu6-Anwendung-TachiWaza.md \
+	Kyu6-Anwendung-NeWaza.md \
+	Kyu6-Randori.md \
+	Kyu6-Lexikon.md
+
+.PHONY: all
+all: kyu8 kyu7
+
+.PHONY: kyu7 kyu8 kyu6
+kyu8: kyu8.html
+kyu7: kyu7.html
+kyu6: kyu6.html
+
+kyu8.html: $(kyu8-sourceFiles)
+	pandoc -i --section-divs -t revealjs -s -o kyu7.html $(kyu7-sourceFiles)
+
+kyu7.html: $(kyu7-sourceFiles)
+	pandoc -i --section-divs -t revealjs -s -o kyu7.html $(kyu7-sourceFiles)
+
+kyu6.html: $(kyu6-sourceFiles)
+	pandoc -i --section-divs -t revealjs -s -o kyu6.html $(kyu6-sourceFiles)
+	./yt-clipper.py Kyu6.json
+
+.PHONY: directoryStructure
+directoryStructure:
+	mkdir -p videos/8terKyu/Ukemi
+	mkdir -p videos/8terKyu/NageWaza
+	mkdir -p videos/8terKyu/OsaeKomiWaza
+	mkdir -p videos/8terKyu/TachiWaza
+	mkdir -p videos/8terKyu/NeWaza
+	mkdir -p videos/8terKyu/Randori
+	mkdir -p videos/7terKyu/Ukemi
+	mkdir -p videos/7terKyu/NageWaza
+	mkdir -p videos/7terKyu/OsaeKomiWaza
+	mkdir -p videos/7terKyu/TachiWaza
+	mkdir -p videos/7terKyu/NeWaza
+	mkdir -p videos/7terKyu/Randori
+	mkdir -p videos/6terKyu/Ukemi
+	mkdir -p videos/6terKyu/NageWaza
+	mkdir -p videos/6terKyu/OsaeKomiWaza
+	mkdir -p videos/6terKyu/TachiWaza
+	mkdir -p videos/6terKyu/NeWaza
+	mkdir -p videos/6terKyu/Randori
+	mkdir -p videos/5terKyu/Ukemi
+	mkdir -p videos/5terKyu/NageWaza
+	mkdir -p videos/5terKyu/KansetsuWaza
+	mkdir -p videos/5terKyu/TachiWaza
+	mkdir -p videos/5terKyu/NeWaza
+	mkdir -p videos/5terKyu/Randori
+
+.PHONY: clean
+clean:
+	rm kyu6.html
diff --git a/DieJudoGürtelprüfung/clipper b/DieJudoGürtelprüfung/clipper
new file mode 100755
index 0000000..9f21a66
--- /dev/null
+++ b/DieJudoGürtelprüfung/clipper
@@ -0,0 +1,127 @@
+#! /usr/bin/env python3
+
+import youtube_dl
+import json
+import ffmpeg
+import subprocess
+import glob
+import sys
+import argparse
+
+config = {
+	'vcodec': "vp9",
+	'acodec': "libopus"
+}
+
+
+argParser = argparse.ArgumentParser()
+
+
+jsonFileName = sys.argv[1]
+
+clipDict = {}
+with open(jsonFileName) as jf:
+	clipDict = json.load(jf)
+
+ydl_opts = {"outtmpl": "%(id)s"}
+
+for clip in clipDict:
+	infoDict = None
+	with youtube_dl.YoutubeDL(ydl_opts) as ydl:
+		infoDict = ydl.extract_info(clip['source'], download=False)
+		ydl.download([clip['source']])
+		
+	if infoDict is not None:
+		if 'from' in clip and 'to' in clip:
+			stream = ffmpeg.input(
+				# @todo This is a very bad hack because the outtmpl options doesn't seem to be working if the file gets reencoded
+				glob.glob(infoDict['id']+"*")[0], 
+				ss=clip['from'], 
+				to=clip['to'], 
+			)
+		else:
+			stream = ffmpeg.input(
+				glob.glob(infoDict['id']+"*")[0], 
+			)
+
+		video = stream.video
+		audio = stream.audio
+
+		if 'crop' in clip:
+			stream = ffmpeg.filter(stream, 
+				"crop",
+				x=clip['crop']['x'],
+				y=clip['crop']['y'],
+				w=clip['crop']['w'],
+				h=clip['crop']['h']
+			)
+
+		h = 480
+		w = -2
+		if 'scale' in clip:
+			h = clip['scale']['h'] if 'h' in clip['scale'] else 480
+			w = clip['scale']['w'] if 'w' in clip['scale'] else -2
+		stream = ffmpeg.filter(stream, "scale", height=h, width=w )
+
+		stream = ffmpeg.output(stream, 
+			clip['target'], 
+			vcodec=config['vcodec'], 
+			**{
+				# "an":None,
+				"y":None, 
+				"pass":"1", 
+				"b:v":"512k", "minrate":"375k", "maxrate":"1088k", 
+				"quality":"good", 
+			}
+		)
+		try:
+			ffmpeg.run(stream)
+		except:
+			print(infoDict)
+
+
+		if 'from' in clip and 'to' in clip:
+			stream = ffmpeg.input(
+				glob.glob(infoDict['id']+"*")[0], 
+				ss=clip['from'], 
+				to=clip['to'], 
+			)
+		else:
+			stream = ffmpeg.input(
+				glob.glob(infoDict['id']+"*")[0]
+			)
+		if 'crop' in clip:
+			stream = ffmpeg.filter(stream, 
+				"crop",
+				x=clip['crop']['x'],
+				y=clip['crop']['y'],
+				w=clip['crop']['w'],
+				h=clip['crop']['h']
+			)
+
+		h = 480
+		w = -2
+		if 'scale' in clip:
+			h = clip['scale']['h'] if 'h' in clip['scale'] else 480
+			w = clip['scale']['w'] if 'w' in clip['scale'] else -2
+		stream = ffmpeg.filter(stream, "scale", height=h, width=w )
+
+		stream = ffmpeg.output(stream, audio, 
+			clip['target'], 
+			vcodec=config['vcodec'], 
+			**{
+				# "an":None,
+				"y":None, 
+				"pass":"2", 
+				"b:v":"512k", "minrate":"375k", "maxrate":"1088k", 
+				"quality":"good", 
+				"acodec": config['acodec'],
+			}
+		)
+		try:
+			ffmpeg.run(stream)
+		except:
+			print(infoDict)
+
+
+#640x480p @ 24,25,30 	512 (LQ), 750 (MQ) 	256 (LQ) 375 (MQ) 	742 (LQ) 1088 (MQ)
diff --git a/DieJudoGürtelprüfung/kyu.php b/DieJudoGürtelprüfung/kyu.php
new file mode 100644
index 0000000..9510474
--- /dev/null
+++ b/DieJudoGürtelprüfung/kyu.php
@@ -0,0 +1,254 @@
+<?php
+require("lib/Parsedown.php");
+require("lib/Spyc.php");
+
+$mdRoot = "markdown/".(array_key_exists('kyu', $_GET)?$_GET['kyu']:"8")."terKyu";
+
+$Parsedown = new Parsedown();
+
+//! loading a markdownfile with yaml-header
+//! returns an assocative array('yaml'=>array(..), 'mdText'=>string)
+function loadMarkdownFile($fileName){
+	$fileText = file_get_contents($fileName);
+
+	$fileParts = preg_split('/[\n]*[-]{3}[\n]/', $fileText, 3);
+
+	return array(
+		'yaml' => Spyc::YAMLLoadString($fileParts[1])
+		, 'mdText' => preg_replace("/^#(.*)$/m", "", $fileParts[2])
+	);
+}
+
+/// @brief Gibt die URL der gerade aufgerufenen Seite zurück
+function getCurPagesUrl(){
+	$pageURL = 'http';
+	if ($_SERVER["HTTPS"] == "on"){
+		$pageURL .= "s";
+	}
+	$pageURL .= "://";
+	if($_SERVER["SERVER_PORT"] != "80"){
+		$pageURL .= $_SERVER["SERVER_NAME"].":".$_SERVER["SERVER_PORT"].$_SERVER["REQUEST_URI"];
+	}
+	else{
+		$pageURL .= $_SERVER["SERVER_NAME"].$_SERVER["REQUEST_URI"];
+	}
+return $pageURL;
+}
+
+function htmlCardCode($article, $Parsedown){
+	if(
+		empty($article['yaml'])
+		&& empty($article['mdText'])
+	) return "";
+	$videoFrame = (
+		array_key_exists('yaml', $article)
+		?(
+			array_key_exists('video', $article['yaml'])
+			?(
+				"<div style=\"text-align: center;width=100%;height=auto;\">".html5VideoFrame($article['yaml']['video'])."</div>"
+			)
+			:""
+		)
+		:""
+	);
+	$ytVideoFrame = (
+		array_key_exists('yaml', $article)
+		?(
+			array_key_exists('youtube', $article['yaml'])
+			?(
+				ytLightEmbed($article['yaml']['youtube'])
+			)
+			:""
+		)
+		:""
+	);
+return
+	"<div class=\"col s12 m6\">"
+		."<div class=\"card blue-grey darken-1\">"
+			."<div class=\"card-image\">"
+				.(!empty($videoFrame)?$videoFrame:$ytVideoFrame)
+			."</div>"
+			."<div class=\"card-content white-text\">"
+				."<span class=\"card-title activator\">"
+					.$article['yaml']['title']
+					."<i class=\"material-icons right\">more_vert</i>"
+				."</span>"
+			."</div>"
+			."<div class=\"card-reveal\">"
+				."<span class=\"card-title\">"
+					.$article['yaml']['title']
+					."<i class=\"material-icons right\">close</i>"
+				."</span>"
+				.$Parsedown->text($article['mdText'])
+			."</div>"
+		."</div>"
+	."</div>";
+}
+
+//! create the <video>Tag for videoJs
+function videoJsFrame($item){
+	return "<video "
+		."id=\"".str_replace("/", "-", $item['url'])."\" "
+		."class=\"video-js\" "
+		."controls "
+		."preload=\"auto\" "
+		// ."poster=\"//vjs.zencdn.net/v/oceans.png\""
+		."data-setup='{}' "
+	.">"
+		."<source src=\"".$item['url']."\" type=\"video/webm\">"//</source>"
+		."<p class=\"vjs-no-js\">"
+			."To view this video please enable JavaScript, and consider upgrading to a web browser that "
+			."<a href=\"https://videojs.com/html5-video-support/\" target=\"_blank\">"
+				."supports HTML5 video"
+			."</a>"
+		."</p>"
+	."</video>";
+}
+
+function html5VideoFrame($item){
+	return "<video "
+		."style=\"max-width:100%;height: auto;\""
+		." src=\"".$item['url']."\""
+		." width=\"".$item['width']."\""
+		." height=\"".$item['height']."\""
+		." controls"
+	."></video>";
+}
+
+//! embed youtube
+function ytLightEmbed($item){
+	return "<lite-youtube "
+		."videoid=\"".$item['videoid']."\" "
+		// ."playlabel=\"".$title."\""
+		."params=\""
+			."start=".$item['from']
+			."&end=".$item['to']
+			."&modestbranding=1"
+			."&playsinline=0"
+			."&loop=1"
+		."\" "
+	."></lite-youtube>";
+}
+?>
+<!DOCTYPE html>
+<html lang="de">
+	<head>
+		<meta charset="UTF-8">
+		<title>Gürtelprüfungsordnung</title>
+
+		<!-- Compiled and minified CSS -->
+		<link rel="stylesheet" href="https://cdn.jsdelivr.net/npm/@materializecss/materialize@1.1.0-alpha/dist/css/materialize.min.css">
+		<!-- Compiled and minified JavaScript -->
+		<script src="https://cdn.jsdelivr.net/npm/@materializecss/materialize@1.1.0-alpha/dist/js/materialize.min.js"></script>
+		<!--Import Google Icon Font-->
+		<link href="https://fonts.googleapis.com/icon?family=Material+Icons" rel="stylesheet">
+		<!-- unpkg : use the latest version of Video.js -->
+		<link href="https://unpkg.com/video.js/dist/video-js.min.css" rel="stylesheet">
+		<script src="https://unpkg.com/video.js/dist/video.min.js"></script>
+		
+		<!-- Include the CSS & JS.. (This could be direct from the package or bundled) -->
+		<link rel="stylesheet" href="lib/lite-youtube-embed/lite-yt-embed.css" />
+		<script src="lib/lite-youtube-embed/lite-yt-embed.js"></script>
+
+		<!--- AutoInit -->
+		<script>
+			document.addEventListener('DOMContentLoaded', function() {
+				var materialboxElements = document.querySelectorAll('.materialboxed');
+				var materialboxInstances = M.Materialbox.init(materialboxElements, {
+					// specify options here
+				});
+			});
+			document.addEventListener('DOMContentLoaded', function() {
+				var elems = document.querySelectorAll('.sidenav');
+				var instances = M.Sidenav.init(elems, {
+					// specify options here
+				});
+			});
+		</script>
+		<style>
+			h1{
+				font-size: 2.5rem;				
+			}
+			h2{
+				font-size: 2.25rem;
+			}
+			h3{
+				font-size: 2.0rem;
+			}
+		</style>
+		
+	  	<!--Let browser know website is optimized for mobile-->
+		<meta name="viewport" content="width=device-width, initial-scale=1.0"/>
+		<style>
+			ul:not(.browser-default) > li{
+				list-style-type: circle;
+			}
+		</style>
+	</head>
+
+	<body>
+		<ul id="slide-out" class="sidenav">
+			<li><a href="kyu.php?kyu=8">8. Kyu - weiß-gelb</a></li>
+			<li><a href="kyu.php?kyu=7">7. Kyu - gelb</a></li>
+			<li><a href="kyu.php?kyu=6">6. Kyu - gelb-orange</a></li>
+			<li><a href="kyu.php?kyu=5">5. Kyu - orange</a></li>
+			<li><a href="kyu.php?kyu=4">4. Kyu - orange-grün</a></li>
+		</ul>
+		<a href="#" data-target="slide-out" class="sidenav-trigger"><i class="material-icons">menu</i></a>
+			<?php
+			$kyuMetadata = Spyc::YAMLLoad( $mdRoot."/meta.yaml" );
+			echo("<h1>".$kyuMetadata['title']."</h1>");
+
+			$dirNames = [];
+			$dirIterator = new DirectoryIterator( $mdRoot );			
+			foreach ( $dirIterator as $dirInfo ) {
+				if(!$dirInfo->isDir() || $dirInfo->isDot()) continue;
+				$dirNames[] = $dirInfo->__toString();
+			}
+			sort($dirNames);
+			foreach($dirNames as $dirName){
+				$fullDirName = $mdRoot."/".$dirName;
+				$sectionMetadata = Spyc::YAMLLoad( $fullDirName."/meta.yaml" );
+				echo("<div class=\"row\">");
+				echo("<h2>".$sectionMetadata['title']."</h2>");
+
+				$fileIterator = new DirectoryIterator($fullDirName);				
+				$fileNames = [];
+				foreach($fileIterator as $fileInfo){
+					if(!$fileInfo->isFile()) continue;
+					if( $fileInfo->getExtension() != "md") continue;
+					$fileNames[] = $fileInfo->__toString();
+				}
+				sort($fileNames);
+				foreach( $fileNames as $fileName){
+					$fullFileName = $fullDirName."/".$fileName; 
+					$article = loadMarkdownFile( $fullFileName );
+					echo( htmlCardCode($article, $Parsedown) );
+				}
+				echo("</div>");
+			};
+			?>
+
+		<footer class="page-footer blue-grey darken-1">
+			<div class="container">
+				<div class="col l4 offset-l2 s12">
+					<ul>
+						<li>
+							<a 
+								title="Seite auf HTML 5 Konformität prüfen"
+								href="http://validator.w3.org/check?uri=<?php echo(urlencode(getCurPagesUrl()));?>"
+								rel="nofollow"
+							>Valid <img
+								src="/ressourcen/graphiken/icons/HTML5_1Color_Black.svg"
+								alt="HTML 5"
+								title="HTML 5 Logo"
+								style="height:1em;display:inline;vertical-align:middle;">
+							</a>
+						</li>
+					</ul>
+				</div>
+			</div>
+		</footer>
+
+	</body>
+</html>
\ No newline at end of file
diff --git a/DieJudoGürtelprüfung/lib/Parsedown.php b/DieJudoGürtelprüfung/lib/Parsedown.php
new file mode 100644
index 0000000..ae0cbde
--- /dev/null
+++ b/DieJudoGürtelprüfung/lib/Parsedown.php
@@ -0,0 +1,1994 @@
+<?php
+
+#
+#
+# Parsedown
+# http://parsedown.org
+#
+# (c) Emanuil Rusev
+# http://erusev.com
+#
+# For the full license information, view the LICENSE file that was distributed
+# with this source code.
+#
+#
+
+class Parsedown
+{
+    # ~
+
+    const version = '1.8.0-beta-7';
+
+    # ~
+
+    function text($text)
+    {
+        $Elements = $this->textElements($text);
+
+        # convert to markup
+        $markup = $this->elements($Elements);
+
+        # trim line breaks
+        $markup = trim($markup, "\n");
+
+        return $markup;
+    }
+
+    protected function textElements($text)
+    {
+        # make sure no definitions are set
+        $this->DefinitionData = array();
+
+        # standardize line breaks
+        $text = str_replace(array("\r\n", "\r"), "\n", $text);
+
+        # remove surrounding line breaks
+        $text = trim($text, "\n");
+
+        # split text into lines
+        $lines = explode("\n", $text);
+
+        # iterate through lines to identify blocks
+        return $this->linesElements($lines);
+    }
+
+    #
+    # Setters
+    #
+
+    function setBreaksEnabled($breaksEnabled)
+    {
+        $this->breaksEnabled = $breaksEnabled;
+
+        return $this;
+    }
+
+    protected $breaksEnabled;
+
+    function setMarkupEscaped($markupEscaped)
+    {
+        $this->markupEscaped = $markupEscaped;
+
+        return $this;
+    }
+
+    protected $markupEscaped;
+
+    function setUrlsLinked($urlsLinked)
+    {
+        $this->urlsLinked = $urlsLinked;
+
+        return $this;
+    }
+
+    protected $urlsLinked = true;
+
+    function setSafeMode($safeMode)
+    {
+        $this->safeMode = (bool) $safeMode;
+
+        return $this;
+    }
+
+    protected $safeMode;
+
+    function setStrictMode($strictMode)
+    {
+        $this->strictMode = (bool) $strictMode;
+
+        return $this;
+    }
+
+    protected $strictMode;
+
+    protected $safeLinksWhitelist = array(
+        'http://',
+        'https://',
+        'ftp://',
+        'ftps://',
+        'mailto:',
+        'tel:',
+        'data:image/png;base64,',
+        'data:image/gif;base64,',
+        'data:image/jpeg;base64,',
+        'irc:',
+        'ircs:',
+        'git:',
+        'ssh:',
+        'news:',
+        'steam:',
+    );
+
+    #
+    # Lines
+    #
+
+    protected $BlockTypes = array(
+        '#' => array('Header'),
+        '*' => array('Rule', 'List'),
+        '+' => array('List'),
+        '-' => array('SetextHeader', 'Table', 'Rule', 'List'),
+        '0' => array('List'),
+        '1' => array('List'),
+        '2' => array('List'),
+        '3' => array('List'),
+        '4' => array('List'),
+        '5' => array('List'),
+        '6' => array('List'),
+        '7' => array('List'),
+        '8' => array('List'),
+        '9' => array('List'),
+        ':' => array('Table'),
+        '<' => array('Comment', 'Markup'),
+        '=' => array('SetextHeader'),
+        '>' => array('Quote'),
+        '[' => array('Reference'),
+        '_' => array('Rule'),
+        '`' => array('FencedCode'),
+        '|' => array('Table'),
+        '~' => array('FencedCode'),
+    );
+
+    # ~
+
+    protected $unmarkedBlockTypes = array(
+        'Code',
+    );
+
+    #
+    # Blocks
+    #
+
+    protected function lines(array $lines)
+    {
+        return $this->elements($this->linesElements($lines));
+    }
+
+    protected function linesElements(array $lines)
+    {
+        $Elements = array();
+        $CurrentBlock = null;
+
+        foreach ($lines as $line)
+        {
+            if (chop($line) === '')
+            {
+                if (isset($CurrentBlock))
+                {
+                    $CurrentBlock['interrupted'] = (isset($CurrentBlock['interrupted'])
+                        ? $CurrentBlock['interrupted'] + 1 : 1
+                    );
+                }
+
+                continue;
+            }
+
+            while (($beforeTab = strstr($line, "\t", true)) !== false)
+            {
+                $shortage = 4 - mb_strlen($beforeTab, 'utf-8') % 4;
+
+                $line = $beforeTab
+                    . str_repeat(' ', $shortage)
+                    . substr($line, strlen($beforeTab) + 1)
+                ;
+            }
+
+            $indent = strspn($line, ' ');
+
+            $text = $indent > 0 ? substr($line, $indent) : $line;
+
+            # ~
+
+            $Line = array('body' => $line, 'indent' => $indent, 'text' => $text);
+
+            # ~
+
+            if (isset($CurrentBlock['continuable']))
+            {
+                $methodName = 'block' . $CurrentBlock['type'] . 'Continue';
+                $Block = $this->$methodName($Line, $CurrentBlock);
+
+                if (isset($Block))
+                {
+                    $CurrentBlock = $Block;
+
+                    continue;
+                }
+                else
+                {
+                    if ($this->isBlockCompletable($CurrentBlock['type']))
+                    {
+                        $methodName = 'block' . $CurrentBlock['type'] . 'Complete';
+                        $CurrentBlock = $this->$methodName($CurrentBlock);
+                    }
+                }
+            }
+
+            # ~
+
+            $marker = $text[0];
+
+            # ~
+
+            $blockTypes = $this->unmarkedBlockTypes;
+
+            if (isset($this->BlockTypes[$marker]))
+            {
+                foreach ($this->BlockTypes[$marker] as $blockType)
+                {
+                    $blockTypes []= $blockType;
+                }
+            }
+
+            #
+            # ~
+
+            foreach ($blockTypes as $blockType)
+            {
+                $Block = $this->{"block$blockType"}($Line, $CurrentBlock);
+
+                if (isset($Block))
+                {
+                    $Block['type'] = $blockType;
+
+                    if ( ! isset($Block['identified']))
+                    {
+                        if (isset($CurrentBlock))
+                        {
+                            $Elements[] = $this->extractElement($CurrentBlock);
+                        }
+
+                        $Block['identified'] = true;
+                    }
+
+                    if ($this->isBlockContinuable($blockType))
+                    {
+                        $Block['continuable'] = true;
+                    }
+
+                    $CurrentBlock = $Block;
+
+                    continue 2;
+                }
+            }
+
+            # ~
+
+            if (isset($CurrentBlock) and $CurrentBlock['type'] === 'Paragraph')
+            {
+                $Block = $this->paragraphContinue($Line, $CurrentBlock);
+            }
+
+            if (isset($Block))
+            {
+                $CurrentBlock = $Block;
+            }
+            else
+            {
+                if (isset($CurrentBlock))
+                {
+                    $Elements[] = $this->extractElement($CurrentBlock);
+                }
+
+                $CurrentBlock = $this->paragraph($Line);
+
+                $CurrentBlock['identified'] = true;
+            }
+        }
+
+        # ~
+
+        if (isset($CurrentBlock['continuable']) and $this->isBlockCompletable($CurrentBlock['type']))
+        {
+            $methodName = 'block' . $CurrentBlock['type'] . 'Complete';
+            $CurrentBlock = $this->$methodName($CurrentBlock);
+        }
+
+        # ~
+
+        if (isset($CurrentBlock))
+        {
+            $Elements[] = $this->extractElement($CurrentBlock);
+        }
+
+        # ~
+
+        return $Elements;
+    }
+
+    protected function extractElement(array $Component)
+    {
+        if ( ! isset($Component['element']))
+        {
+            if (isset($Component['markup']))
+            {
+                $Component['element'] = array('rawHtml' => $Component['markup']);
+            }
+            elseif (isset($Component['hidden']))
+            {
+                $Component['element'] = array();
+            }
+        }
+
+        return $Component['element'];
+    }
+
+    protected function isBlockContinuable($Type)
+    {
+        return method_exists($this, 'block' . $Type . 'Continue');
+    }
+
+    protected function isBlockCompletable($Type)
+    {
+        return method_exists($this, 'block' . $Type . 'Complete');
+    }
+
+    #
+    # Code
+
+    protected function blockCode($Line, $Block = null)
+    {
+        if (isset($Block) and $Block['type'] === 'Paragraph' and ! isset($Block['interrupted']))
+        {
+            return;
+        }
+
+        if ($Line['indent'] >= 4)
+        {
+            $text = substr($Line['body'], 4);
+
+            $Block = array(
+                'element' => array(
+                    'name' => 'pre',
+                    'element' => array(
+                        'name' => 'code',
+                        'text' => $text,
+                    ),
+                ),
+            );
+
+            return $Block;
+        }
+    }
+
+    protected function blockCodeContinue($Line, $Block)
+    {
+        if ($Line['indent'] >= 4)
+        {
+            if (isset($Block['interrupted']))
+            {
+                $Block['element']['element']['text'] .= str_repeat("\n", $Block['interrupted']);
+
+                unset($Block['interrupted']);
+            }
+
+            $Block['element']['element']['text'] .= "\n";
+
+            $text = substr($Line['body'], 4);
+
+            $Block['element']['element']['text'] .= $text;
+
+            return $Block;
+        }
+    }
+
+    protected function blockCodeComplete($Block)
+    {
+        return $Block;
+    }
+
+    #
+    # Comment
+
+    protected function blockComment($Line)
+    {
+        if ($this->markupEscaped or $this->safeMode)
+        {
+            return;
+        }
+
+        if (strpos($Line['text'], '<!--') === 0)
+        {
+            $Block = array(
+                'element' => array(
+                    'rawHtml' => $Line['body'],
+                    'autobreak' => true,
+                ),
+            );
+
+            if (strpos($Line['text'], '-->') !== false)
+            {
+                $Block['closed'] = true;
+            }
+
+            return $Block;
+        }
+    }
+
+    protected function blockCommentContinue($Line, array $Block)
+    {
+        if (isset($Block['closed']))
+        {
+            return;
+        }
+
+        $Block['element']['rawHtml'] .= "\n" . $Line['body'];
+
+        if (strpos($Line['text'], '-->') !== false)
+        {
+            $Block['closed'] = true;
+        }
+
+        return $Block;
+    }
+
+    #
+    # Fenced Code
+
+    protected function blockFencedCode($Line)
+    {
+        $marker = $Line['text'][0];
+
+        $openerLength = strspn($Line['text'], $marker);
+
+        if ($openerLength < 3)
+        {
+            return;
+        }
+
+        $infostring = trim(substr($Line['text'], $openerLength), "\t ");
+
+        if (strpos($infostring, '`') !== false)
+        {
+            return;
+        }
+
+        $Element = array(
+            'name' => 'code',
+            'text' => '',
+        );
+
+        if ($infostring !== '')
+        {
+            /**
+             * https://www.w3.org/TR/2011/WD-html5-20110525/elements.html#classes
+             * Every HTML element may have a class attribute specified.
+             * The attribute, if specified, must have a value that is a set
+             * of space-separated tokens representing the various classes
+             * that the element belongs to.
+             * [...]
+             * The space characters, for the purposes of this specification,
+             * are U+0020 SPACE, U+0009 CHARACTER TABULATION (tab),
+             * U+000A LINE FEED (LF), U+000C FORM FEED (FF), and
+             * U+000D CARRIAGE RETURN (CR).
+             */
+            $language = substr($infostring, 0, strcspn($infostring, " \t\n\f\r"));
+
+            $Element['attributes'] = array('class' => "language-$language");
+        }
+
+        $Block = array(
+            'char' => $marker,
+            'openerLength' => $openerLength,
+            'element' => array(
+                'name' => 'pre',
+                'element' => $Element,
+            ),
+        );
+
+        return $Block;
+    }
+
+    protected function blockFencedCodeContinue($Line, $Block)
+    {
+        if (isset($Block['complete']))
+        {
+            return;
+        }
+
+        if (isset($Block['interrupted']))
+        {
+            $Block['element']['element']['text'] .= str_repeat("\n", $Block['interrupted']);
+
+            unset($Block['interrupted']);
+        }
+
+        if (($len = strspn($Line['text'], $Block['char'])) >= $Block['openerLength']
+            and chop(substr($Line['text'], $len), ' ') === ''
+        ) {
+            $Block['element']['element']['text'] = substr($Block['element']['element']['text'], 1);
+
+            $Block['complete'] = true;
+
+            return $Block;
+        }
+
+        $Block['element']['element']['text'] .= "\n" . $Line['body'];
+
+        return $Block;
+    }
+
+    protected function blockFencedCodeComplete($Block)
+    {
+        return $Block;
+    }
+
+    #
+    # Header
+
+    protected function blockHeader($Line)
+    {
+        $level = strspn($Line['text'], '#');
+
+        if ($level > 6)
+        {
+            return;
+        }
+
+        $text = trim($Line['text'], '#');
+
+        if ($this->strictMode and isset($text[0]) and $text[0] !== ' ')
+        {
+            return;
+        }
+
+        $text = trim($text, ' ');
+
+        $Block = array(
+            'element' => array(
+                'name' => 'h' . $level,
+                'handler' => array(
+                    'function' => 'lineElements',
+                    'argument' => $text,
+                    'destination' => 'elements',
+                )
+            ),
+        );
+
+        return $Block;
+    }
+
+    #
+    # List
+
+    protected function blockList($Line, array $CurrentBlock = null)
+    {
+        list($name, $pattern) = $Line['text'][0] <= '-' ? array('ul', '[*+-]') : array('ol', '[0-9]{1,9}+[.\)]');
+
+        if (preg_match('/^('.$pattern.'([ ]++|$))(.*+)/', $Line['text'], $matches))
+        {
+            $contentIndent = strlen($matches[2]);
+
+            if ($contentIndent >= 5)
+            {
+                $contentIndent -= 1;
+                $matches[1] = substr($matches[1], 0, -$contentIndent);
+                $matches[3] = str_repeat(' ', $contentIndent) . $matches[3];
+            }
+            elseif ($contentIndent === 0)
+            {
+                $matches[1] .= ' ';
+            }
+
+            $markerWithoutWhitespace = strstr($matches[1], ' ', true);
+
+            $Block = array(
+                'indent' => $Line['indent'],
+                'pattern' => $pattern,
+                'data' => array(
+                    'type' => $name,
+                    'marker' => $matches[1],
+                    'markerType' => ($name === 'ul' ? $markerWithoutWhitespace : substr($markerWithoutWhitespace, -1)),
+                ),
+                'element' => array(
+                    'name' => $name,
+                    'elements' => array(),
+                ),
+            );
+            $Block['data']['markerTypeRegex'] = preg_quote($Block['data']['markerType'], '/');
+
+            if ($name === 'ol')
+            {
+                $listStart = ltrim(strstr($matches[1], $Block['data']['markerType'], true), '0') ?: '0';
+
+                if ($listStart !== '1')
+                {
+                    if (
+                        isset($CurrentBlock)
+                        and $CurrentBlock['type'] === 'Paragraph'
+                        and ! isset($CurrentBlock['interrupted'])
+                    ) {
+                        return;
+                    }
+
+                    $Block['element']['attributes'] = array('start' => $listStart);
+                }
+            }
+
+            $Block['li'] = array(
+                'name' => 'li',
+                'handler' => array(
+                    'function' => 'li',
+                    'argument' => !empty($matches[3]) ? array($matches[3]) : array(),
+                    'destination' => 'elements'
+                )
+            );
+
+            $Block['element']['elements'] []= & $Block['li'];
+
+            return $Block;
+        }
+    }
+
+    protected function blockListContinue($Line, array $Block)
+    {
+        if (isset($Block['interrupted']) and empty($Block['li']['handler']['argument']))
+        {
+            return null;
+        }
+
+        $requiredIndent = ($Block['indent'] + strlen($Block['data']['marker']));
+
+        if ($Line['indent'] < $requiredIndent
+            and (
+                (
+                    $Block['data']['type'] === 'ol'
+                    and preg_match('/^[0-9]++'.$Block['data']['markerTypeRegex'].'(?:[ ]++(.*)|$)/', $Line['text'], $matches)
+                ) or (
+                    $Block['data']['type'] === 'ul'
+                    and preg_match('/^'.$Block['data']['markerTypeRegex'].'(?:[ ]++(.*)|$)/', $Line['text'], $matches)
+                )
+            )
+        ) {
+            if (isset($Block['interrupted']))
+            {
+                $Block['li']['handler']['argument'] []= '';
+
+                $Block['loose'] = true;
+
+                unset($Block['interrupted']);
+            }
+
+            unset($Block['li']);
+
+            $text = isset($matches[1]) ? $matches[1] : '';
+
+            $Block['indent'] = $Line['indent'];
+
+            $Block['li'] = array(
+                'name' => 'li',
+                'handler' => array(
+                    'function' => 'li',
+                    'argument' => array($text),
+                    'destination' => 'elements'
+                )
+            );
+
+            $Block['element']['elements'] []= & $Block['li'];
+
+            return $Block;
+        }
+        elseif ($Line['indent'] < $requiredIndent and $this->blockList($Line))
+        {
+            return null;
+        }
+
+        if ($Line['text'][0] === '[' and $this->blockReference($Line))
+        {
+            return $Block;
+        }
+
+        if ($Line['indent'] >= $requiredIndent)
+        {
+            if (isset($Block['interrupted']))
+            {
+                $Block['li']['handler']['argument'] []= '';
+
+                $Block['loose'] = true;
+
+                unset($Block['interrupted']);
+            }
+
+            $text = substr($Line['body'], $requiredIndent);
+
+            $Block['li']['handler']['argument'] []= $text;
+
+            return $Block;
+        }
+
+        if ( ! isset($Block['interrupted']))
+        {
+            $text = preg_replace('/^[ ]{0,'.$requiredIndent.'}+/', '', $Line['body']);
+
+            $Block['li']['handler']['argument'] []= $text;
+
+            return $Block;
+        }
+    }
+
+    protected function blockListComplete(array $Block)
+    {
+        if (isset($Block['loose']))
+        {
+            foreach ($Block['element']['elements'] as &$li)
+            {
+                if (end($li['handler']['argument']) !== '')
+                {
+                    $li['handler']['argument'] []= '';
+                }
+            }
+        }
+
+        return $Block;
+    }
+
+    #
+    # Quote
+
+    protected function blockQuote($Line)
+    {
+        if (preg_match('/^>[ ]?+(.*+)/', $Line['text'], $matches))
+        {
+            $Block = array(
+                'element' => array(
+                    'name' => 'blockquote',
+                    'handler' => array(
+                        'function' => 'linesElements',
+                        'argument' => (array) $matches[1],
+                        'destination' => 'elements',
+                    )
+                ),
+            );
+
+            return $Block;
+        }
+    }
+
+    protected function blockQuoteContinue($Line, array $Block)
+    {
+        if (isset($Block['interrupted']))
+        {
+            return;
+        }
+
+        if ($Line['text'][0] === '>' and preg_match('/^>[ ]?+(.*+)/', $Line['text'], $matches))
+        {
+            $Block['element']['handler']['argument'] []= $matches[1];
+
+            return $Block;
+        }
+
+        if ( ! isset($Block['interrupted']))
+        {
+            $Block['element']['handler']['argument'] []= $Line['text'];
+
+            return $Block;
+        }
+    }
+
+    #
+    # Rule
+
+    protected function blockRule($Line)
+    {
+        $marker = $Line['text'][0];
+
+        if (substr_count($Line['text'], $marker) >= 3 and chop($Line['text'], " $marker") === '')
+        {
+            $Block = array(
+                'element' => array(
+                    'name' => 'hr',
+                ),
+            );
+
+            return $Block;
+        }
+    }
+
+    #
+    # Setext
+
+    protected function blockSetextHeader($Line, array $Block = null)
+    {
+        if ( ! isset($Block) or $Block['type'] !== 'Paragraph' or isset($Block['interrupted']))
+        {
+            return;
+        }
+
+        if ($Line['indent'] < 4 and chop(chop($Line['text'], ' '), $Line['text'][0]) === '')
+        {
+            $Block['element']['name'] = $Line['text'][0] === '=' ? 'h1' : 'h2';
+
+            return $Block;
+        }
+    }
+
+    #
+    # Markup
+
+    protected function blockMarkup($Line)
+    {
+        if ($this->markupEscaped or $this->safeMode)
+        {
+            return;
+        }
+
+        if (preg_match('/^<[\/]?+(\w*)(?:[ ]*+'.$this->regexHtmlAttribute.')*+[ ]*+(\/)?>/', $Line['text'], $matches))
+        {
+            $element = strtolower($matches[1]);
+
+            if (in_array($element, $this->textLevelElements))
+            {
+                return;
+            }
+
+            $Block = array(
+                'name' => $matches[1],
+                'element' => array(
+                    'rawHtml' => $Line['text'],
+                    'autobreak' => true,
+                ),
+            );
+
+            return $Block;
+        }
+    }
+
+    protected function blockMarkupContinue($Line, array $Block)
+    {
+        if (isset($Block['closed']) or isset($Block['interrupted']))
+        {
+            return;
+        }
+
+        $Block['element']['rawHtml'] .= "\n" . $Line['body'];
+
+        return $Block;
+    }
+
+    #
+    # Reference
+
+    protected function blockReference($Line)
+    {
+        if (strpos($Line['text'], ']') !== false
+            and preg_match('/^\[(.+?)\]:[ ]*+<?(\S+?)>?(?:[ ]+["\'(](.+)["\')])?[ ]*+$/', $Line['text'], $matches)
+        ) {
+            $id = strtolower($matches[1]);
+
+            $Data = array(
+                'url' => $matches[2],
+                'title' => isset($matches[3]) ? $matches[3] : null,
+            );
+
+            $this->DefinitionData['Reference'][$id] = $Data;
+
+            $Block = array(
+                'element' => array(),
+            );
+
+            return $Block;
+        }
+    }
+
+    #
+    # Table
+
+    protected function blockTable($Line, array $Block = null)
+    {
+        if ( ! isset($Block) or $Block['type'] !== 'Paragraph' or isset($Block['interrupted']))
+        {
+            return;
+        }
+
+        if (
+            strpos($Block['element']['handler']['argument'], '|') === false
+            and strpos($Line['text'], '|') === false
+            and strpos($Line['text'], ':') === false
+            or strpos($Block['element']['handler']['argument'], "\n") !== false
+        ) {
+            return;
+        }
+
+        if (chop($Line['text'], ' -:|') !== '')
+        {
+            return;
+        }
+
+        $alignments = array();
+
+        $divider = $Line['text'];
+
+        $divider = trim($divider);
+        $divider = trim($divider, '|');
+
+        $dividerCells = explode('|', $divider);
+
+        foreach ($dividerCells as $dividerCell)
+        {
+            $dividerCell = trim($dividerCell);
+
+            if ($dividerCell === '')
+            {
+                return;
+            }
+
+            $alignment = null;
+
+            if ($dividerCell[0] === ':')
+            {
+                $alignment = 'left';
+            }
+
+            if (substr($dividerCell, - 1) === ':')
+            {
+                $alignment = $alignment === 'left' ? 'center' : 'right';
+            }
+
+            $alignments []= $alignment;
+        }
+
+        # ~
+
+        $HeaderElements = array();
+
+        $header = $Block['element']['handler']['argument'];
+
+        $header = trim($header);
+        $header = trim($header, '|');
+
+        $headerCells = explode('|', $header);
+
+        if (count($headerCells) !== count($alignments))
+        {
+            return;
+        }
+
+        foreach ($headerCells as $index => $headerCell)
+        {
+            $headerCell = trim($headerCell);
+
+            $HeaderElement = array(
+                'name' => 'th',
+                'handler' => array(
+                    'function' => 'lineElements',
+                    'argument' => $headerCell,
+                    'destination' => 'elements',
+                )
+            );
+
+            if (isset($alignments[$index]))
+            {
+                $alignment = $alignments[$index];
+
+                $HeaderElement['attributes'] = array(
+                    'style' => "text-align: $alignment;",
+                );
+            }
+
+            $HeaderElements []= $HeaderElement;
+        }
+
+        # ~
+
+        $Block = array(
+            'alignments' => $alignments,
+            'identified' => true,
+            'element' => array(
+                'name' => 'table',
+                'elements' => array(),
+            ),
+        );
+
+        $Block['element']['elements'] []= array(
+            'name' => 'thead',
+        );
+
+        $Block['element']['elements'] []= array(
+            'name' => 'tbody',
+            'elements' => array(),
+        );
+
+        $Block['element']['elements'][0]['elements'] []= array(
+            'name' => 'tr',
+            'elements' => $HeaderElements,
+        );
+
+        return $Block;
+    }
+
+    protected function blockTableContinue($Line, array $Block)
+    {
+        if (isset($Block['interrupted']))
+        {
+            return;
+        }
+
+        if (count($Block['alignments']) === 1 or $Line['text'][0] === '|' or strpos($Line['text'], '|'))
+        {
+            $Elements = array();
+
+            $row = $Line['text'];
+
+            $row = trim($row);
+            $row = trim($row, '|');
+
+            preg_match_all('/(?:(\\\\[|])|[^|`]|`[^`]++`|`)++/', $row, $matches);
+
+            $cells = array_slice($matches[0], 0, count($Block['alignments']));
+
+            foreach ($cells as $index => $cell)
+            {
+                $cell = trim($cell);
+
+                $Element = array(
+                    'name' => 'td',
+                    'handler' => array(
+                        'function' => 'lineElements',
+                        'argument' => $cell,
+                        'destination' => 'elements',
+                    )
+                );
+
+                if (isset($Block['alignments'][$index]))
+                {
+                    $Element['attributes'] = array(
+                        'style' => 'text-align: ' . $Block['alignments'][$index] . ';',
+                    );
+                }
+
+                $Elements []= $Element;
+            }
+
+            $Element = array(
+                'name' => 'tr',
+                'elements' => $Elements,
+            );
+
+            $Block['element']['elements'][1]['elements'] []= $Element;
+
+            return $Block;
+        }
+    }
+
+    #
+    # ~
+    #
+
+    protected function paragraph($Line)
+    {
+        return array(
+            'type' => 'Paragraph',
+            'element' => array(
+                'name' => 'p',
+                'handler' => array(
+                    'function' => 'lineElements',
+                    'argument' => $Line['text'],
+                    'destination' => 'elements',
+                ),
+            ),
+        );
+    }
+
+    protected function paragraphContinue($Line, array $Block)
+    {
+        if (isset($Block['interrupted']))
+        {
+            return;
+        }
+
+        $Block['element']['handler']['argument'] .= "\n".$Line['text'];
+
+        return $Block;
+    }
+
+    #
+    # Inline Elements
+    #
+
+    protected $InlineTypes = array(
+        '!' => array('Image'),
+        '&' => array('SpecialCharacter'),
+        '*' => array('Emphasis'),
+        ':' => array('Url'),
+        '<' => array('UrlTag', 'EmailTag', 'Markup'),
+        '[' => array('Link'),
+        '_' => array('Emphasis'),
+        '`' => array('Code'),
+        '~' => array('Strikethrough'),
+        '\\' => array('EscapeSequence'),
+    );
+
+    # ~
+
+    protected $inlineMarkerList = '!*_&[:<`~\\';
+
+    #
+    # ~
+    #
+
+    public function line($text, $nonNestables = array())
+    {
+        return $this->elements($this->lineElements($text, $nonNestables));
+    }
+
+    protected function lineElements($text, $nonNestables = array())
+    {
+        # standardize line breaks
+        $text = str_replace(array("\r\n", "\r"), "\n", $text);
+
+        $Elements = array();
+
+        $nonNestables = (empty($nonNestables)
+            ? array()
+            : array_combine($nonNestables, $nonNestables)
+        );
+
+        # $excerpt is based on the first occurrence of a marker
+
+        while ($excerpt = strpbrk($text, $this->inlineMarkerList))
+        {
+            $marker = $excerpt[0];
+
+            $markerPosition = strlen($text) - strlen($excerpt);
+
+            $Excerpt = array('text' => $excerpt, 'context' => $text);
+
+            foreach ($this->InlineTypes[$marker] as $inlineType)
+            {
+                # check to see if the current inline type is nestable in the current context
+
+                if (isset($nonNestables[$inlineType]))
+                {
+                    continue;
+                }
+
+                $Inline = $this->{"inline$inlineType"}($Excerpt);
+
+                if ( ! isset($Inline))
+                {
+                    continue;
+                }
+
+                # makes sure that the inline belongs to "our" marker
+
+                if (isset($Inline['position']) and $Inline['position'] > $markerPosition)
+                {
+                    continue;
+                }
+
+                # sets a default inline position
+
+                if ( ! isset($Inline['position']))
+                {
+                    $Inline['position'] = $markerPosition;
+                }
+
+                # cause the new element to 'inherit' our non nestables
+
+
+                $Inline['element']['nonNestables'] = isset($Inline['element']['nonNestables'])
+                    ? array_merge($Inline['element']['nonNestables'], $nonNestables)
+                    : $nonNestables
+                ;
+
+                # the text that comes before the inline
+                $unmarkedText = substr($text, 0, $Inline['position']);
+
+                # compile the unmarked text
+                $InlineText = $this->inlineText($unmarkedText);
+                $Elements[] = $InlineText['element'];
+
+                # compile the inline
+                $Elements[] = $this->extractElement($Inline);
+
+                # remove the examined text
+                $text = substr($text, $Inline['position'] + $Inline['extent']);
+
+                continue 2;
+            }
+
+            # the marker does not belong to an inline
+
+            $unmarkedText = substr($text, 0, $markerPosition + 1);
+
+            $InlineText = $this->inlineText($unmarkedText);
+            $Elements[] = $InlineText['element'];
+
+            $text = substr($text, $markerPosition + 1);
+        }
+
+        $InlineText = $this->inlineText($text);
+        $Elements[] = $InlineText['element'];
+
+        foreach ($Elements as &$Element)
+        {
+            if ( ! isset($Element['autobreak']))
+            {
+                $Element['autobreak'] = false;
+            }
+        }
+
+        return $Elements;
+    }
+
+    #
+    # ~
+    #
+
+    protected function inlineText($text)
+    {
+        $Inline = array(
+            'extent' => strlen($text),
+            'element' => array(),
+        );
+
+        $Inline['element']['elements'] = self::pregReplaceElements(
+            $this->breaksEnabled ? '/[ ]*+\n/' : '/(?:[ ]*+\\\\|[ ]{2,}+)\n/',
+            array(
+                array('name' => 'br'),
+                array('text' => "\n"),
+            ),
+            $text
+        );
+
+        return $Inline;
+    }
+
+    protected function inlineCode($Excerpt)
+    {
+        $marker = $Excerpt['text'][0];
+
+        if (preg_match('/^(['.$marker.']++)[ ]*+(.+?)[ ]*+(?<!['.$marker.'])\1(?!'.$marker.')/s', $Excerpt['text'], $matches))
+        {
+            $text = $matches[2];
+            $text = preg_replace('/[ ]*+\n/', ' ', $text);
+
+            return array(
+                'extent' => strlen($matches[0]),
+                'element' => array(
+                    'name' => 'code',
+                    'text' => $text,
+                ),
+            );
+        }
+    }
+
+    protected function inlineEmailTag($Excerpt)
+    {
+        $hostnameLabel = '[a-zA-Z0-9](?:[a-zA-Z0-9-]{0,61}[a-zA-Z0-9])?';
+
+        $commonMarkEmail = '[a-zA-Z0-9.!#$%&\'*+\/=?^_`{|}~-]++@'
+            . $hostnameLabel . '(?:\.' . $hostnameLabel . ')*';
+
+        if (strpos($Excerpt['text'], '>') !== false
+            and preg_match("/^<((mailto:)?$commonMarkEmail)>/i", $Excerpt['text'], $matches)
+        ){
+            $url = $matches[1];
+
+            if ( ! isset($matches[2]))
+            {
+                $url = "mailto:$url";
+            }
+
+            return array(
+                'extent' => strlen($matches[0]),
+                'element' => array(
+                    'name' => 'a',
+                    'text' => $matches[1],
+                    'attributes' => array(
+                        'href' => $url,
+                    ),
+                ),
+            );
+        }
+    }
+
+    protected function inlineEmphasis($Excerpt)
+    {
+        if ( ! isset($Excerpt['text'][1]))
+        {
+            return;
+        }
+
+        $marker = $Excerpt['text'][0];
+
+        if ($Excerpt['text'][1] === $marker and preg_match($this->StrongRegex[$marker], $Excerpt['text'], $matches))
+        {
+            $emphasis = 'strong';
+        }
+        elseif (preg_match($this->EmRegex[$marker], $Excerpt['text'], $matches))
+        {
+            $emphasis = 'em';
+        }
+        else
+        {
+            return;
+        }
+
+        return array(
+            'extent' => strlen($matches[0]),
+            'element' => array(
+                'name' => $emphasis,
+                'handler' => array(
+                    'function' => 'lineElements',
+                    'argument' => $matches[1],
+                    'destination' => 'elements',
+                )
+            ),
+        );
+    }
+
+    protected function inlineEscapeSequence($Excerpt)
+    {
+        if (isset($Excerpt['text'][1]) and in_array($Excerpt['text'][1], $this->specialCharacters))
+        {
+            return array(
+                'element' => array('rawHtml' => $Excerpt['text'][1]),
+                'extent' => 2,
+            );
+        }
+    }
+
+    protected function inlineImage($Excerpt)
+    {
+        if ( ! isset($Excerpt['text'][1]) or $Excerpt['text'][1] !== '[')
+        {
+            return;
+        }
+
+        $Excerpt['text']= substr($Excerpt['text'], 1);
+
+        $Link = $this->inlineLink($Excerpt);
+
+        if ($Link === null)
+        {
+            return;
+        }
+
+        $Inline = array(
+            'extent' => $Link['extent'] + 1,
+            'element' => array(
+                'name' => 'img',
+                'attributes' => array(
+                    'src' => $Link['element']['attributes']['href'],
+                    'alt' => $Link['element']['handler']['argument'],
+                ),
+                'autobreak' => true,
+            ),
+        );
+
+        $Inline['element']['attributes'] += $Link['element']['attributes'];
+
+        unset($Inline['element']['attributes']['href']);
+
+        return $Inline;
+    }
+
+    protected function inlineLink($Excerpt)
+    {
+        $Element = array(
+            'name' => 'a',
+            'handler' => array(
+                'function' => 'lineElements',
+                'argument' => null,
+                'destination' => 'elements',
+            ),
+            'nonNestables' => array('Url', 'Link'),
+            'attributes' => array(
+                'href' => null,
+                'title' => null,
+            ),
+        );
+
+        $extent = 0;
+
+        $remainder = $Excerpt['text'];
+
+        if (preg_match('/\[((?:[^][]++|(?R))*+)\]/', $remainder, $matches))
+        {
+            $Element['handler']['argument'] = $matches[1];
+
+            $extent += strlen($matches[0]);
+
+            $remainder = substr($remainder, $extent);
+        }
+        else
+        {
+            return;
+        }
+
+        if (preg_match('/^[(]\s*+((?:[^ ()]++|[(][^ )]+[)])++)(?:[ ]+("[^"]*+"|\'[^\']*+\'))?\s*+[)]/', $remainder, $matches))
+        {
+            $Element['attributes']['href'] = $matches[1];
+
+            if (isset($matches[2]))
+            {
+                $Element['attributes']['title'] = substr($matches[2], 1, - 1);
+            }
+
+            $extent += strlen($matches[0]);
+        }
+        else
+        {
+            if (preg_match('/^\s*\[(.*?)\]/', $remainder, $matches))
+            {
+                $definition = strlen($matches[1]) ? $matches[1] : $Element['handler']['argument'];
+                $definition = strtolower($definition);
+
+                $extent += strlen($matches[0]);
+            }
+            else
+            {
+                $definition = strtolower($Element['handler']['argument']);
+            }
+
+            if ( ! isset($this->DefinitionData['Reference'][$definition]))
+            {
+                return;
+            }
+
+            $Definition = $this->DefinitionData['Reference'][$definition];
+
+            $Element['attributes']['href'] = $Definition['url'];
+            $Element['attributes']['title'] = $Definition['title'];
+        }
+
+        return array(
+            'extent' => $extent,
+            'element' => $Element,
+        );
+    }
+
+    protected function inlineMarkup($Excerpt)
+    {
+        if ($this->markupEscaped or $this->safeMode or strpos($Excerpt['text'], '>') === false)
+        {
+            return;
+        }
+
+        if ($Excerpt['text'][1] === '/' and preg_match('/^<\/\w[\w-]*+[ ]*+>/s', $Excerpt['text'], $matches))
+        {
+            return array(
+                'element' => array('rawHtml' => $matches[0]),
+                'extent' => strlen($matches[0]),
+            );
+        }
+
+        if ($Excerpt['text'][1] === '!' and preg_match('/^<!---?[^>-](?:-?+[^-])*-->/s', $Excerpt['text'], $matches))
+        {
+            return array(
+                'element' => array('rawHtml' => $matches[0]),
+                'extent' => strlen($matches[0]),
+            );
+        }
+
+        if ($Excerpt['text'][1] !== ' ' and preg_match('/^<\w[\w-]*+(?:[ ]*+'.$this->regexHtmlAttribute.')*+[ ]*+\/?>/s', $Excerpt['text'], $matches))
+        {
+            return array(
+                'element' => array('rawHtml' => $matches[0]),
+                'extent' => strlen($matches[0]),
+            );
+        }
+    }
+
+    protected function inlineSpecialCharacter($Excerpt)
+    {
+        if (substr($Excerpt['text'], 1, 1) !== ' ' and strpos($Excerpt['text'], ';') !== false
+            and preg_match('/^&(#?+[0-9a-zA-Z]++);/', $Excerpt['text'], $matches)
+        ) {
+            return array(
+                'element' => array('rawHtml' => '&' . $matches[1] . ';'),
+                'extent' => strlen($matches[0]),
+            );
+        }
+
+        return;
+    }
+
+    protected function inlineStrikethrough($Excerpt)
+    {
+        if ( ! isset($Excerpt['text'][1]))
+        {
+            return;
+        }
+
+        if ($Excerpt['text'][1] === '~' and preg_match('/^~~(?=\S)(.+?)(?<=\S)~~/', $Excerpt['text'], $matches))
+        {
+            return array(
+                'extent' => strlen($matches[0]),
+                'element' => array(
+                    'name' => 'del',
+                    'handler' => array(
+                        'function' => 'lineElements',
+                        'argument' => $matches[1],
+                        'destination' => 'elements',
+                    )
+                ),
+            );
+        }
+    }
+
+    protected function inlineUrl($Excerpt)
+    {
+        if ($this->urlsLinked !== true or ! isset($Excerpt['text'][2]) or $Excerpt['text'][2] !== '/')
+        {
+            return;
+        }
+
+        if (strpos($Excerpt['context'], 'http') !== false
+            and preg_match('/\bhttps?+:[\/]{2}[^\s<]+\b\/*+/ui', $Excerpt['context'], $matches, PREG_OFFSET_CAPTURE)
+        ) {
+            $url = $matches[0][0];
+
+            $Inline = array(
+                'extent' => strlen($matches[0][0]),
+                'position' => $matches[0][1],
+                'element' => array(
+                    'name' => 'a',
+                    'text' => $url,
+                    'attributes' => array(
+                        'href' => $url,
+                    ),
+                ),
+            );
+
+            return $Inline;
+        }
+    }
+
+    protected function inlineUrlTag($Excerpt)
+    {
+        if (strpos($Excerpt['text'], '>') !== false and preg_match('/^<(\w++:\/{2}[^ >]++)>/i', $Excerpt['text'], $matches))
+        {
+            $url = $matches[1];
+
+            return array(
+                'extent' => strlen($matches[0]),
+                'element' => array(
+                    'name' => 'a',
+                    'text' => $url,
+                    'attributes' => array(
+                        'href' => $url,
+                    ),
+                ),
+            );
+        }
+    }
+
+    # ~
+
+    protected function unmarkedText($text)
+    {
+        $Inline = $this->inlineText($text);
+        return $this->element($Inline['element']);
+    }
+
+    #
+    # Handlers
+    #
+
+    protected function handle(array $Element)
+    {
+        if (isset($Element['handler']))
+        {
+            if (!isset($Element['nonNestables']))
+            {
+                $Element['nonNestables'] = array();
+            }
+
+            if (is_string($Element['handler']))
+            {
+                $function = $Element['handler'];
+                $argument = $Element['text'];
+                unset($Element['text']);
+                $destination = 'rawHtml';
+            }
+            else
+            {
+                $function = $Element['handler']['function'];
+                $argument = $Element['handler']['argument'];
+                $destination = $Element['handler']['destination'];
+            }
+
+            $Element[$destination] = $this->{$function}($argument, $Element['nonNestables']);
+
+            if ($destination === 'handler')
+            {
+                $Element = $this->handle($Element);
+            }
+
+            unset($Element['handler']);
+        }
+
+        return $Element;
+    }
+
+    protected function handleElementRecursive(array $Element)
+    {
+        return $this->elementApplyRecursive(array($this, 'handle'), $Element);
+    }
+
+    protected function handleElementsRecursive(array $Elements)
+    {
+        return $this->elementsApplyRecursive(array($this, 'handle'), $Elements);
+    }
+
+    protected function elementApplyRecursive($closure, array $Element)
+    {
+        $Element = call_user_func($closure, $Element);
+
+        if (isset($Element['elements']))
+        {
+            $Element['elements'] = $this->elementsApplyRecursive($closure, $Element['elements']);
+        }
+        elseif (isset($Element['element']))
+        {
+            $Element['element'] = $this->elementApplyRecursive($closure, $Element['element']);
+        }
+
+        return $Element;
+    }
+
+    protected function elementApplyRecursiveDepthFirst($closure, array $Element)
+    {
+        if (isset($Element['elements']))
+        {
+            $Element['elements'] = $this->elementsApplyRecursiveDepthFirst($closure, $Element['elements']);
+        }
+        elseif (isset($Element['element']))
+        {
+            $Element['element'] = $this->elementsApplyRecursiveDepthFirst($closure, $Element['element']);
+        }
+
+        $Element = call_user_func($closure, $Element);
+
+        return $Element;
+    }
+
+    protected function elementsApplyRecursive($closure, array $Elements)
+    {
+        foreach ($Elements as &$Element)
+        {
+            $Element = $this->elementApplyRecursive($closure, $Element);
+        }
+
+        return $Elements;
+    }
+
+    protected function elementsApplyRecursiveDepthFirst($closure, array $Elements)
+    {
+        foreach ($Elements as &$Element)
+        {
+            $Element = $this->elementApplyRecursiveDepthFirst($closure, $Element);
+        }
+
+        return $Elements;
+    }
+
+    protected function element(array $Element)
+    {
+        if ($this->safeMode)
+        {
+            $Element = $this->sanitiseElement($Element);
+        }
+
+        # identity map if element has no handler
+        $Element = $this->handle($Element);
+
+        $hasName = isset($Element['name']);
+
+        $markup = '';
+
+        if ($hasName)
+        {
+            $markup .= '<' . $Element['name'];
+
+            if (isset($Element['attributes']))
+            {
+                foreach ($Element['attributes'] as $name => $value)
+                {
+                    if ($value === null)
+                    {
+                        continue;
+                    }
+
+                    $markup .= " $name=\"".self::escape($value).'"';
+                }
+            }
+        }
+
+        $permitRawHtml = false;
+
+        if (isset($Element['text']))
+        {
+            $text = $Element['text'];
+        }
+        // very strongly consider an alternative if you're writing an
+        // extension
+        elseif (isset($Element['rawHtml']))
+        {
+            $text = $Element['rawHtml'];
+
+            $allowRawHtmlInSafeMode = isset($Element['allowRawHtmlInSafeMode']) && $Element['allowRawHtmlInSafeMode'];
+            $permitRawHtml = !$this->safeMode || $allowRawHtmlInSafeMode;
+        }
+
+        $hasContent = isset($text) || isset($Element['element']) || isset($Element['elements']);
+
+        if ($hasContent)
+        {
+            $markup .= $hasName ? '>' : '';
+
+            if (isset($Element['elements']))
+            {
+                $markup .= $this->elements($Element['elements']);
+            }
+            elseif (isset($Element['element']))
+            {
+                $markup .= $this->element($Element['element']);
+            }
+            else
+            {
+                if (!$permitRawHtml)
+                {
+                    $markup .= self::escape($text, true);
+                }
+                else
+                {
+                    $markup .= $text;
+                }
+            }
+
+            $markup .= $hasName ? '</' . $Element['name'] . '>' : '';
+        }
+        elseif ($hasName)
+        {
+            $markup .= ' />';
+        }
+
+        return $markup;
+    }
+
+    protected function elements(array $Elements)
+    {
+        $markup = '';
+
+        $autoBreak = true;
+
+        foreach ($Elements as $Element)
+        {
+            if (empty($Element))
+            {
+                continue;
+            }
+
+            $autoBreakNext = (isset($Element['autobreak'])
+                ? $Element['autobreak'] : isset($Element['name'])
+            );
+            // (autobreak === false) covers both sides of an element
+            $autoBreak = !$autoBreak ? $autoBreak : $autoBreakNext;
+
+            $markup .= ($autoBreak ? "\n" : '') . $this->element($Element);
+            $autoBreak = $autoBreakNext;
+        }
+
+        $markup .= $autoBreak ? "\n" : '';
+
+        return $markup;
+    }
+
+    # ~
+
+    protected function li($lines)
+    {
+        $Elements = $this->linesElements($lines);
+
+        if ( ! in_array('', $lines)
+            and isset($Elements[0]) and isset($Elements[0]['name'])
+            and $Elements[0]['name'] === 'p'
+        ) {
+            unset($Elements[0]['name']);
+        }
+
+        return $Elements;
+    }
+
+    #
+    # AST Convenience
+    #
+
+    /**
+     * Replace occurrences $regexp with $Elements in $text. Return an array of
+     * elements representing the replacement.
+     */
+    protected static function pregReplaceElements($regexp, $Elements, $text)
+    {
+        $newElements = array();
+
+        while (preg_match($regexp, $text, $matches, PREG_OFFSET_CAPTURE))
+        {
+            $offset = $matches[0][1];
+            $before = substr($text, 0, $offset);
+            $after = substr($text, $offset + strlen($matches[0][0]));
+
+            $newElements[] = array('text' => $before);
+
+            foreach ($Elements as $Element)
+            {
+                $newElements[] = $Element;
+            }
+
+            $text = $after;
+        }
+
+        $newElements[] = array('text' => $text);
+
+        return $newElements;
+    }
+
+    #
+    # Deprecated Methods
+    #
+
+    function parse($text)
+    {
+        $markup = $this->text($text);
+
+        return $markup;
+    }
+
+    protected function sanitiseElement(array $Element)
+    {
+        static $goodAttribute = '/^[a-zA-Z0-9][a-zA-Z0-9-_]*+$/';
+        static $safeUrlNameToAtt  = array(
+            'a'   => 'href',
+            'img' => 'src',
+        );
+
+        if ( ! isset($Element['name']))
+        {
+            unset($Element['attributes']);
+            return $Element;
+        }
+
+        if (isset($safeUrlNameToAtt[$Element['name']]))
+        {
+            $Element = $this->filterUnsafeUrlInAttribute($Element, $safeUrlNameToAtt[$Element['name']]);
+        }
+
+        if ( ! empty($Element['attributes']))
+        {
+            foreach ($Element['attributes'] as $att => $val)
+            {
+                # filter out badly parsed attribute
+                if ( ! preg_match($goodAttribute, $att))
+                {
+                    unset($Element['attributes'][$att]);
+                }
+                # dump onevent attribute
+                elseif (self::striAtStart($att, 'on'))
+                {
+                    unset($Element['attributes'][$att]);
+                }
+            }
+        }
+
+        return $Element;
+    }
+
+    protected function filterUnsafeUrlInAttribute(array $Element, $attribute)
+    {
+        foreach ($this->safeLinksWhitelist as $scheme)
+        {
+            if (self::striAtStart($Element['attributes'][$attribute], $scheme))
+            {
+                return $Element;
+            }
+        }
+
+        $Element['attributes'][$attribute] = str_replace(':', '%3A', $Element['attributes'][$attribute]);
+
+        return $Element;
+    }
+
+    #
+    # Static Methods
+    #
+
+    protected static function escape($text, $allowQuotes = false)
+    {
+        return htmlspecialchars($text, $allowQuotes ? ENT_NOQUOTES : ENT_QUOTES, 'UTF-8');
+    }
+
+    protected static function striAtStart($string, $needle)
+    {
+        $len = strlen($needle);
+
+        if ($len > strlen($string))
+        {
+            return false;
+        }
+        else
+        {
+            return strtolower(substr($string, 0, $len)) === strtolower($needle);
+        }
+    }
+
+    static function instance($name = 'default')
+    {
+        if (isset(self::$instances[$name]))
+        {
+            return self::$instances[$name];
+        }
+
+        $instance = new static();
+
+        self::$instances[$name] = $instance;
+
+        return $instance;
+    }
+
+    private static $instances = array();
+
+    #
+    # Fields
+    #
+
+    protected $DefinitionData;
+
+    #
+    # Read-Only
+
+    protected $specialCharacters = array(
+        '\\', '`', '*', '_', '{', '}', '[', ']', '(', ')', '>', '#', '+', '-', '.', '!', '|', '~'
+    );
+
+    protected $StrongRegex = array(
+        '*' => '/^[*]{2}((?:\\\\\*|[^*]|[*][^*]*+[*])+?)[*]{2}(?![*])/s',
+        '_' => '/^__((?:\\\\_|[^_]|_[^_]*+_)+?)__(?!_)/us',
+    );
+
+    protected $EmRegex = array(
+        '*' => '/^[*]((?:\\\\\*|[^*]|[*][*][^*]+?[*][*])+?)[*](?![*])/s',
+        '_' => '/^_((?:\\\\_|[^_]|__[^_]*__)+?)_(?!_)\b/us',
+    );
+
+    protected $regexHtmlAttribute = '[a-zA-Z_:][\w:.-]*+(?:\s*+=\s*+(?:[^"\'=<>`\s]+|"[^"]*+"|\'[^\']*+\'))?+';
+
+    protected $voidElements = array(
+        'area', 'base', 'br', 'col', 'command', 'embed', 'hr', 'img', 'input', 'link', 'meta', 'param', 'source',
+    );
+
+    protected $textLevelElements = array(
+        'a', 'br', 'bdo', 'abbr', 'blink', 'nextid', 'acronym', 'basefont',
+        'b', 'em', 'big', 'cite', 'small', 'spacer', 'listing',
+        'i', 'rp', 'del', 'code',          'strike', 'marquee',
+        'q', 'rt', 'ins', 'font',          'strong',
+        's', 'tt', 'kbd', 'mark',
+        'u', 'xm', 'sub', 'nobr',
+                   'sup', 'ruby',
+                   'var', 'span',
+                   'wbr', 'time',
+    );
+}
diff --git a/DieJudoGürtelprüfung/lib/Spyc.php b/DieJudoGürtelprüfung/lib/Spyc.php
new file mode 100644
index 0000000..3fe0f62
--- /dev/null
+++ b/DieJudoGürtelprüfung/lib/Spyc.php
@@ -0,0 +1,1186 @@
+<?php
+/**
+   * Spyc -- A Simple PHP YAML Class
+   * @version 0.6.2
+   * @author Vlad Andersen <vlad.andersen@gmail.com>
+   * @author Chris Wanstrath <chris@ozmm.org>
+   * @link https://github.com/mustangostang/spyc/
+   * @copyright Copyright 2005-2006 Chris Wanstrath, 2006-2011 Vlad Andersen
+   * @license http://www.opensource.org/licenses/mit-license.php MIT License
+   * @package Spyc
+   */
+
+if (!function_exists('spyc_load')) {
+  /**
+   * Parses YAML to array.
+   * @param string $string YAML string.
+   * @return array
+   */
+  function spyc_load ($string) {
+    return Spyc::YAMLLoadString($string);
+  }
+}
+
+if (!function_exists('spyc_load_file')) {
+  /**
+   * Parses YAML to array.
+   * @param string $file Path to YAML file.
+   * @return array
+   */
+  function spyc_load_file ($file) {
+    return Spyc::YAMLLoad($file);
+  }
+}
+
+if (!function_exists('spyc_dump')) {
+  /**
+   * Dumps array to YAML.
+   * @param array $data Array.
+   * @return string
+   */
+  function spyc_dump ($data) {
+    return Spyc::YAMLDump($data, false, false, true);
+  }
+}
+
+if (!class_exists('Spyc')) {
+
+/**
+   * The Simple PHP YAML Class.
+   *
+   * This class can be used to read a YAML file and convert its contents
+   * into a PHP array.  It currently supports a very limited subsection of
+   * the YAML spec.
+   *
+   * Usage:
+   * <code>
+   *   $Spyc  = new Spyc;
+   *   $array = $Spyc->load($file);
+   * </code>
+   * or:
+   * <code>
+   *   $array = Spyc::YAMLLoad($file);
+   * </code>
+   * or:
+   * <code>
+   *   $array = spyc_load_file($file);
+   * </code>
+   * @package Spyc
+   */
+class Spyc {
+
+  // SETTINGS
+
+  const REMPTY = "\0\0\0\0\0";
+
+  /**
+   * Setting this to true will force YAMLDump to enclose any string value in
+   * quotes.  False by default.
+   *
+   * @var bool
+   */
+  public $setting_dump_force_quotes = false;
+
+  /**
+   * Setting this to true will forse YAMLLoad to use syck_load function when
+   * possible. False by default.
+   * @var bool
+   */
+  public $setting_use_syck_is_possible = false;
+
+  /**
+   * Setting this to true will forse YAMLLoad to use syck_load function when
+   * possible. False by default.
+   * @var bool
+   */
+  public $setting_empty_hash_as_object = false;
+
+
+  /**#@+
+  * @access private
+  * @var mixed
+  */
+  private $_dumpIndent;
+  private $_dumpWordWrap;
+  private $_containsGroupAnchor = false;
+  private $_containsGroupAlias = false;
+  private $path;
+  private $result;
+  private $LiteralPlaceHolder = '___YAML_Literal_Block___';
+  private $SavedGroups = array();
+  private $indent;
+  /**
+   * Path modifier that should be applied after adding current element.
+   * @var array
+   */
+  private $delayedPath = array();
+
+  /**#@+
+  * @access public
+  * @var mixed
+  */
+  public $_nodeId;
+
+/**
+ * Load a valid YAML string to Spyc.
+ * @param string $input
+ * @return array
+ */
+  public function load ($input) {
+    return $this->_loadString($input);
+  }
+
+ /**
+ * Load a valid YAML file to Spyc.
+ * @param string $file
+ * @return array
+ */
+  public function loadFile ($file) {
+    return $this->_load($file);
+  }
+
+  /**
+     * Load YAML into a PHP array statically
+     *
+     * The load method, when supplied with a YAML stream (string or file),
+     * will do its best to convert YAML in a file into a PHP array.  Pretty
+     * simple.
+     *  Usage:
+     *  <code>
+     *   $array = Spyc::YAMLLoad('lucky.yaml');
+     *   print_r($array);
+     *  </code>
+     * @access public
+     * @return array
+     * @param string $input Path of YAML file or string containing YAML
+     * @param array set options
+     */
+  public static function YAMLLoad($input, $options = []) {
+    $Spyc = new Spyc;
+    foreach ($options as $key => $value) {
+        if (property_exists($Spyc, $key)) {
+            $Spyc->$key = $value;
+        }
+    }
+    return $Spyc->_load($input);
+  }
+
+  /**
+     * Load a string of YAML into a PHP array statically
+     *
+     * The load method, when supplied with a YAML string, will do its best
+     * to convert YAML in a string into a PHP array.  Pretty simple.
+     *
+     * Note: use this function if you don't want files from the file system
+     * loaded and processed as YAML.  This is of interest to people concerned
+     * about security whose input is from a string.
+     *
+     *  Usage:
+     *  <code>
+     *   $array = Spyc::YAMLLoadString("---\n0: hello world\n");
+     *   print_r($array);
+     *  </code>
+     * @access public
+     * @return array
+     * @param string $input String containing YAML
+     * @param array set options
+     */
+  public static function YAMLLoadString($input, $options = []) {
+    $Spyc = new Spyc;
+    foreach ($options as $key => $value) {
+        if (property_exists($Spyc, $key)) {
+            $Spyc->$key = $value;
+        }
+    }
+    return $Spyc->_loadString($input);
+  }
+
+  /**
+     * Dump YAML from PHP array statically
+     *
+     * The dump method, when supplied with an array, will do its best
+     * to convert the array into friendly YAML.  Pretty simple.  Feel free to
+     * save the returned string as nothing.yaml and pass it around.
+     *
+     * Oh, and you can decide how big the indent is and what the wordwrap
+     * for folding is.  Pretty cool -- just pass in 'false' for either if
+     * you want to use the default.
+     *
+     * Indent's default is 2 spaces, wordwrap's default is 40 characters.  And
+     * you can turn off wordwrap by passing in 0.
+     *
+     * @access public
+     * @return string
+     * @param array|\stdClass $array PHP array
+     * @param int $indent Pass in false to use the default, which is 2
+     * @param int $wordwrap Pass in 0 for no wordwrap, false for default (40)
+     * @param bool $no_opening_dashes Do not start YAML file with "---\n"
+     */
+  public static function YAMLDump($array, $indent = false, $wordwrap = false, $no_opening_dashes = false) {
+    $spyc = new Spyc;
+    return $spyc->dump($array, $indent, $wordwrap, $no_opening_dashes);
+  }
+
+
+  /**
+     * Dump PHP array to YAML
+     *
+     * The dump method, when supplied with an array, will do its best
+     * to convert the array into friendly YAML.  Pretty simple.  Feel free to
+     * save the returned string as tasteful.yaml and pass it around.
+     *
+     * Oh, and you can decide how big the indent is and what the wordwrap
+     * for folding is.  Pretty cool -- just pass in 'false' for either if
+     * you want to use the default.
+     *
+     * Indent's default is 2 spaces, wordwrap's default is 40 characters.  And
+     * you can turn off wordwrap by passing in 0.
+     *
+     * @access public
+     * @return string
+     * @param array $array PHP array
+     * @param int $indent Pass in false to use the default, which is 2
+     * @param int $wordwrap Pass in 0 for no wordwrap, false for default (40)
+     */
+  public function dump($array,$indent = false,$wordwrap = false, $no_opening_dashes = false) {
+    // Dumps to some very clean YAML.  We'll have to add some more features
+    // and options soon.  And better support for folding.
+
+    // New features and options.
+    if ($indent === false or !is_numeric($indent)) {
+      $this->_dumpIndent = 2;
+    } else {
+      $this->_dumpIndent = $indent;
+    }
+
+    if ($wordwrap === false or !is_numeric($wordwrap)) {
+      $this->_dumpWordWrap = 40;
+    } else {
+      $this->_dumpWordWrap = $wordwrap;
+    }
+
+    // New YAML document
+    $string = "";
+    if (!$no_opening_dashes) $string = "---\n";
+
+    // Start at the base of the array and move through it.
+    if ($array) {
+      $array = (array)$array;
+      $previous_key = -1;
+      foreach ($array as $key => $value) {
+        if (!isset($first_key)) $first_key = $key;
+        $string .= $this->_yamlize($key,$value,0,$previous_key, $first_key, $array);
+        $previous_key = $key;
+      }
+    }
+    return $string;
+  }
+
+  /**
+     * Attempts to convert a key / value array item to YAML
+     * @access private
+     * @return string
+     * @param $key The name of the key
+     * @param $value The value of the item
+     * @param $indent The indent of the current node
+     */
+  private function _yamlize($key,$value,$indent, $previous_key = -1, $first_key = 0, $source_array = null) {
+    if(is_object($value)) $value = (array)$value;
+    if (is_array($value)) {
+      if (empty ($value))
+        return $this->_dumpNode($key, array(), $indent, $previous_key, $first_key, $source_array);
+      // It has children.  What to do?
+      // Make it the right kind of item
+      $string = $this->_dumpNode($key, self::REMPTY, $indent, $previous_key, $first_key, $source_array);
+      // Add the indent
+      $indent += $this->_dumpIndent;
+      // Yamlize the array
+      $string .= $this->_yamlizeArray($value,$indent);
+    } elseif (!is_array($value)) {
+      // It doesn't have children.  Yip.
+      $string = $this->_dumpNode($key, $value, $indent, $previous_key, $first_key, $source_array);
+    }
+    return $string;
+  }
+
+  /**
+     * Attempts to convert an array to YAML
+     * @access private
+     * @return string
+     * @param $array The array you want to convert
+     * @param $indent The indent of the current level
+     */
+  private function _yamlizeArray($array,$indent) {
+    if (is_array($array)) {
+      $string = '';
+      $previous_key = -1;
+      foreach ($array as $key => $value) {
+        if (!isset($first_key)) $first_key = $key;
+        $string .= $this->_yamlize($key, $value, $indent, $previous_key, $first_key, $array);
+        $previous_key = $key;
+      }
+      return $string;
+    } else {
+      return false;
+    }
+  }
+
+  /**
+     * Returns YAML from a key and a value
+     * @access private
+     * @return string
+     * @param $key The name of the key
+     * @param $value The value of the item
+     * @param $indent The indent of the current node
+     */
+  private function _dumpNode($key, $value, $indent, $previous_key = -1, $first_key = 0, $source_array = null) {
+    // do some folding here, for blocks
+    if (is_string ($value) && ((strpos($value,"\n") !== false || strpos($value,": ") !== false || strpos($value,"- ") !== false ||
+      strpos($value,"*") !== false || strpos($value,"#") !== false || strpos($value,"<") !== false || strpos($value,">") !== false || strpos ($value, '%') !== false || strpos ($value, '  ') !== false ||
+      strpos($value,"[") !== false || strpos($value,"]") !== false || strpos($value,"{") !== false || strpos($value,"}") !== false) || strpos($value,"&") !== false || strpos($value, "'") !== false || strpos($value, "!") === 0 ||
+      substr ($value, -1, 1) == ':')
+    ) {
+      $value = $this->_doLiteralBlock($value,$indent);
+    } else {
+      $value  = $this->_doFolding($value,$indent);
+    }
+
+    if ($value === array()) $value = '[ ]';
+    if ($value === "") $value = '""';
+    if (self::isTranslationWord($value)) {
+      $value = $this->_doLiteralBlock($value, $indent);
+    }
+    if (trim ($value) != $value)
+       $value = $this->_doLiteralBlock($value,$indent);
+
+    if (is_bool($value)) {
+       $value = $value ? "true" : "false";
+    }
+
+    if ($value === null) $value = 'null';
+    if ($value === "'" . self::REMPTY . "'") $value = null;
+
+    $spaces = str_repeat(' ',$indent);
+
+    //if (is_int($key) && $key - 1 == $previous_key && $first_key===0) {
+    if (is_array ($source_array) && array_keys($source_array) === range(0, count($source_array) - 1)) {
+      // It's a sequence
+      $string = $spaces.'- '.$value."\n";
+    } else {
+      // if ($first_key===0)  throw new Exception('Keys are all screwy.  The first one was zero, now it\'s "'. $key .'"');
+      // It's mapped
+      if (strpos($key, ":") !== false || strpos($key, "#") !== false) { $key = '"' . $key . '"'; }
+      $string = rtrim ($spaces.$key.': '.$value)."\n";
+    }
+    return $string;
+  }
+
+  /**
+     * Creates a literal block for dumping
+     * @access private
+     * @return string
+     * @param $value
+     * @param $indent int The value of the indent
+     */
+  private function _doLiteralBlock($value,$indent) {
+    if ($value === "\n") return '\n';
+    if (strpos($value, "\n") === false && strpos($value, "'") === false) {
+      return sprintf ("'%s'", $value);
+    }
+    if (strpos($value, "\n") === false && strpos($value, '"') === false) {
+      return sprintf ('"%s"', $value);
+    }
+    $exploded = explode("\n",$value);
+    $newValue = '|';
+    if (isset($exploded[0]) && ($exploded[0] == "|" || $exploded[0] == "|-" || $exploded[0] == ">")) {
+        $newValue = $exploded[0];
+        unset($exploded[0]);
+    }
+    $indent += $this->_dumpIndent;
+    $spaces   = str_repeat(' ',$indent);
+    foreach ($exploded as $line) {
+      $line = trim($line);
+      if (strpos($line, '"') === 0 && strrpos($line, '"') == (strlen($line)-1) || strpos($line, "'") === 0 && strrpos($line, "'") == (strlen($line)-1)) {
+        $line = substr($line, 1, -1);
+      }
+      $newValue .= "\n" . $spaces . ($line);
+    }
+    return $newValue;
+  }
+
+  /**
+     * Folds a string of text, if necessary
+     * @access private
+     * @return string
+     * @param $value The string you wish to fold
+     */
+  private function _doFolding($value,$indent) {
+    // Don't do anything if wordwrap is set to 0
+
+    if ($this->_dumpWordWrap !== 0 && is_string ($value) && strlen($value) > $this->_dumpWordWrap) {
+      $indent += $this->_dumpIndent;
+      $indent = str_repeat(' ',$indent);
+      $wrapped = wordwrap($value,$this->_dumpWordWrap,"\n$indent");
+      $value   = ">\n".$indent.$wrapped;
+    } else {
+      if ($this->setting_dump_force_quotes && is_string ($value) && $value !== self::REMPTY)
+        $value = '"' . $value . '"';
+      if (is_numeric($value) && is_string($value))
+        $value = '"' . $value . '"';
+    }
+
+
+    return $value;
+  }
+
+  private function isTrueWord($value) {
+    $words = self::getTranslations(array('true', 'on', 'yes', 'y'));
+    return in_array($value, $words, true);
+  }
+
+  private function isFalseWord($value) {
+    $words = self::getTranslations(array('false', 'off', 'no', 'n'));
+    return in_array($value, $words, true);
+  }
+
+  private function isNullWord($value) {
+    $words = self::getTranslations(array('null', '~'));
+    return in_array($value, $words, true);
+  }
+
+  private function isTranslationWord($value) {
+    return (
+      self::isTrueWord($value)  ||
+      self::isFalseWord($value) ||
+      self::isNullWord($value)
+    );
+  }
+
+  /**
+     * Coerce a string into a native type
+     * Reference: http://yaml.org/type/bool.html
+     * TODO: Use only words from the YAML spec.
+     * @access private
+     * @param $value The value to coerce
+     */
+  private function coerceValue(&$value) {
+    if (self::isTrueWord($value)) {
+      $value = true;
+    } else if (self::isFalseWord($value)) {
+      $value = false;
+    } else if (self::isNullWord($value)) {
+      $value = null;
+    }
+  }
+
+  /**
+     * Given a set of words, perform the appropriate translations on them to
+     * match the YAML 1.1 specification for type coercing.
+     * @param $words The words to translate
+     * @access private
+     */
+  private static function getTranslations(array $words) {
+    $result = array();
+    foreach ($words as $i) {
+      $result = array_merge($result, array(ucfirst($i), strtoupper($i), strtolower($i)));
+    }
+    return $result;
+  }
+
+// LOADING FUNCTIONS
+
+  private function _load($input) {
+    $Source = $this->loadFromSource($input);
+    return $this->loadWithSource($Source);
+  }
+
+  private function _loadString($input) {
+    $Source = $this->loadFromString($input);
+    return $this->loadWithSource($Source);
+  }
+
+  private function loadWithSource($Source) {
+    if (empty ($Source)) return array();
+    if ($this->setting_use_syck_is_possible && function_exists ('syck_load')) {
+      $array = syck_load (implode ("\n", $Source));
+      return is_array($array) ? $array : array();
+    }
+
+    $this->path = array();
+    $this->result = array();
+
+    $cnt = count($Source);
+    for ($i = 0; $i < $cnt; $i++) {
+      $line = $Source[$i];
+
+      $this->indent = strlen($line) - strlen(ltrim($line));
+      $tempPath = $this->getParentPathByIndent($this->indent);
+      $line = self::stripIndent($line, $this->indent);
+      if (self::isComment($line)) continue;
+      if (self::isEmpty($line)) continue;
+      $this->path = $tempPath;
+
+      $literalBlockStyle = self::startsLiteralBlock($line);
+      if ($literalBlockStyle) {
+        $line = rtrim ($line, $literalBlockStyle . " \n");
+        $literalBlock = '';
+        $line .= ' '.$this->LiteralPlaceHolder;
+        $literal_block_indent = strlen($Source[$i+1]) - strlen(ltrim($Source[$i+1]));
+        while (++$i < $cnt && $this->literalBlockContinues($Source[$i], $this->indent)) {
+          $literalBlock = $this->addLiteralLine($literalBlock, $Source[$i], $literalBlockStyle, $literal_block_indent);
+        }
+        $i--;
+      }
+
+      // Strip out comments
+      if (strpos ($line, '#')) {
+          $line = preg_replace('/\s*#([^"\']+)$/','',$line);
+      }
+
+      while (++$i < $cnt && self::greedilyNeedNextLine($line)) {
+        $line = rtrim ($line, " \n\t\r") . ' ' . ltrim ($Source[$i], " \t");
+      }
+      $i--;
+
+      $lineArray = $this->_parseLine($line);
+
+      if ($literalBlockStyle)
+        $lineArray = $this->revertLiteralPlaceHolder ($lineArray, $literalBlock);
+
+      $this->addArray($lineArray, $this->indent);
+
+      foreach ($this->delayedPath as $indent => $delayedPath)
+        $this->path[$indent] = $delayedPath;
+
+      $this->delayedPath = array();
+
+    }
+    return $this->result;
+  }
+
+  private function loadFromSource ($input) {
+    if (!empty($input) && strpos($input, "\n") === false && file_exists($input))
+      $input = file_get_contents($input);
+
+    return $this->loadFromString($input);
+  }
+
+  private function loadFromString ($input) {
+    $lines = explode("\n",$input);
+    foreach ($lines as $k => $_) {
+      $lines[$k] = rtrim ($_, "\r");
+    }
+    return $lines;
+  }
+
+  /**
+     * Parses YAML code and returns an array for a node
+     * @access private
+     * @return array
+     * @param string $line A line from the YAML file
+     */
+  private function _parseLine($line) {
+    if (!$line) return array();
+    $line = trim($line);
+    if (!$line) return array();
+
+    $array = array();
+
+    $group = $this->nodeContainsGroup($line);
+    if ($group) {
+      $this->addGroup($line, $group);
+      $line = $this->stripGroup ($line, $group);
+    }
+
+    if ($this->startsMappedSequence($line)) {
+      return $this->returnMappedSequence($line);
+    }
+
+    if ($this->startsMappedValue($line)) {
+      return $this->returnMappedValue($line);
+    }
+
+    if ($this->isArrayElement($line))
+      return $this->returnArrayElement($line);
+
+    if ($this->isPlainArray($line))
+     return $this->returnPlainArray($line);
+
+    return $this->returnKeyValuePair($line);
+
+  }
+
+  /**
+     * Finds the type of the passed value, returns the value as the new type.
+     * @access private
+     * @param string $value
+     * @return mixed
+     */
+  private function _toType($value) {
+    if ($value === '') return "";
+
+    if ($this->setting_empty_hash_as_object && $value === '{}') {
+      return new stdClass();
+    }
+
+    $first_character = $value[0];
+    $last_character = substr($value, -1, 1);
+
+    $is_quoted = false;
+    do {
+      if (!$value) break;
+      if ($first_character != '"' && $first_character != "'") break;
+      if ($last_character != '"' && $last_character != "'") break;
+      $is_quoted = true;
+    } while (0);
+
+    if ($is_quoted) {
+      $value = str_replace('\n', "\n", $value);
+      if ($first_character == "'")
+        return strtr(substr ($value, 1, -1), array ('\'\'' => '\'', '\\\''=> '\''));
+      return strtr(substr ($value, 1, -1), array ('\\"' => '"', '\\\''=> '\''));
+    }
+
+    if (strpos($value, ' #') !== false && !$is_quoted)
+      $value = preg_replace('/\s+#(.+)$/','',$value);
+
+    if ($first_character == '[' && $last_character == ']') {
+      // Take out strings sequences and mappings
+      $innerValue = trim(substr ($value, 1, -1));
+      if ($innerValue === '') return array();
+      $explode = $this->_inlineEscape($innerValue);
+      // Propagate value array
+      $value  = array();
+      foreach ($explode as $v) {
+        $value[] = $this->_toType($v);
+      }
+      return $value;
+    }
+
+    if (strpos($value,': ')!==false && $first_character != '{') {
+      $array = explode(': ',$value);
+      $key   = trim($array[0]);
+      array_shift($array);
+      $value = trim(implode(': ',$array));
+      $value = $this->_toType($value);
+      return array($key => $value);
+    }
+
+    if ($first_character == '{' && $last_character == '}') {
+      $innerValue = trim(substr ($value, 1, -1));
+      if ($innerValue === '') return array();
+      // Inline Mapping
+      // Take out strings sequences and mappings
+      $explode = $this->_inlineEscape($innerValue);
+      // Propagate value array
+      $array = array();
+      foreach ($explode as $v) {
+        $SubArr = $this->_toType($v);
+        if (empty($SubArr)) continue;
+        if (is_array ($SubArr)) {
+          $array[key($SubArr)] = $SubArr[key($SubArr)]; continue;
+        }
+        $array[] = $SubArr;
+      }
+      return $array;
+    }
+
+    if ($value == 'null' || $value == 'NULL' || $value == 'Null' || $value == '' || $value == '~') {
+      return null;
+    }
+
+    if ( is_numeric($value) && preg_match ('/^(-|)[1-9]+[0-9]*$/', $value) ){
+      $intvalue = (int)$value;
+      if ($intvalue != PHP_INT_MAX && $intvalue != ~PHP_INT_MAX)
+        $value = $intvalue;
+      return $value;
+    }
+
+    if ( is_string($value) && preg_match('/^0[xX][0-9a-fA-F]+$/', $value)) {
+      // Hexadecimal value.
+      return hexdec($value);
+    }
+
+    $this->coerceValue($value);
+
+    if (is_numeric($value)) {
+      if ($value === '0') return 0;
+      if (rtrim ($value, 0) === $value)
+        $value = (float)$value;
+      return $value;
+    }
+
+    return $value;
+  }
+
+  /**
+     * Used in inlines to check for more inlines or quoted strings
+     * @access private
+     * @return array
+     */
+  private function _inlineEscape($inline) {
+    // There's gotta be a cleaner way to do this...
+    // While pure sequences seem to be nesting just fine,
+    // pure mappings and mappings with sequences inside can't go very
+    // deep.  This needs to be fixed.
+
+    $seqs = array();
+    $maps = array();
+    $saved_strings = array();
+    $saved_empties = array();
+
+    // Check for empty strings
+    $regex = '/("")|(\'\')/';
+    if (preg_match_all($regex,$inline,$strings)) {
+      $saved_empties = $strings[0];
+      $inline  = preg_replace($regex,'YAMLEmpty',$inline);
+    }
+    unset($regex);
+
+    // Check for strings
+    $regex = '/(?:(")|(?:\'))((?(1)[^"]+|[^\']+))(?(1)"|\')/';
+    if (preg_match_all($regex,$inline,$strings)) {
+      $saved_strings = $strings[0];
+      $inline  = preg_replace($regex,'YAMLString',$inline);
+    }
+    unset($regex);
+
+    // echo $inline;
+
+    $i = 0;
+    do {
+
+    // Check for sequences
+    while (preg_match('/\[([^{}\[\]]+)\]/U',$inline,$matchseqs)) {
+      $seqs[] = $matchseqs[0];
+      $inline = preg_replace('/\[([^{}\[\]]+)\]/U', ('YAMLSeq' . (count($seqs) - 1) . 's'), $inline, 1);
+    }
+
+    // Check for mappings
+    while (preg_match('/{([^\[\]{}]+)}/U',$inline,$matchmaps)) {
+      $maps[] = $matchmaps[0];
+      $inline = preg_replace('/{([^\[\]{}]+)}/U', ('YAMLMap' . (count($maps) - 1) . 's'), $inline, 1);
+    }
+
+    if ($i++ >= 10) break;
+
+    } while (strpos ($inline, '[') !== false || strpos ($inline, '{') !== false);
+
+    $explode = explode(',',$inline);
+    $explode = array_map('trim', $explode);
+    $stringi = 0; $i = 0;
+
+    while (1) {
+
+    // Re-add the sequences
+    if (!empty($seqs)) {
+      foreach ($explode as $key => $value) {
+        if (strpos($value,'YAMLSeq') !== false) {
+          foreach ($seqs as $seqk => $seq) {
+            $explode[$key] = str_replace(('YAMLSeq'.$seqk.'s'),$seq,$value);
+            $value = $explode[$key];
+          }
+        }
+      }
+    }
+
+    // Re-add the mappings
+    if (!empty($maps)) {
+      foreach ($explode as $key => $value) {
+        if (strpos($value,'YAMLMap') !== false) {
+          foreach ($maps as $mapk => $map) {
+            $explode[$key] = str_replace(('YAMLMap'.$mapk.'s'), $map, $value);
+            $value = $explode[$key];
+          }
+        }
+      }
+    }
+
+
+    // Re-add the strings
+    if (!empty($saved_strings)) {
+      foreach ($explode as $key => $value) {
+        while (strpos($value,'YAMLString') !== false) {
+          $explode[$key] = preg_replace('/YAMLString/',$saved_strings[$stringi],$value, 1);
+          unset($saved_strings[$stringi]);
+          ++$stringi;
+          $value = $explode[$key];
+        }
+      }
+    }
+
+
+    // Re-add the empties
+    if (!empty($saved_empties)) {
+      foreach ($explode as $key => $value) {
+        while (strpos($value,'YAMLEmpty') !== false) {
+          $explode[$key] = preg_replace('/YAMLEmpty/', '', $value, 1);
+          $value = $explode[$key];
+        }
+      }
+    }
+
+    $finished = true;
+    foreach ($explode as $key => $value) {
+      if (strpos($value,'YAMLSeq') !== false) {
+        $finished = false; break;
+      }
+      if (strpos($value,'YAMLMap') !== false) {
+        $finished = false; break;
+      }
+      if (strpos($value,'YAMLString') !== false) {
+        $finished = false; break;
+      }
+      if (strpos($value,'YAMLEmpty') !== false) {
+        $finished = false; break;
+      }
+    }
+    if ($finished) break;
+
+    $i++;
+    if ($i > 10)
+      break; // Prevent infinite loops.
+    }
+
+
+    return $explode;
+  }
+
+  private function literalBlockContinues ($line, $lineIndent) {
+    if (!trim($line)) return true;
+    if (strlen($line) - strlen(ltrim($line)) > $lineIndent) return true;
+    return false;
+  }
+
+  private function referenceContentsByAlias ($alias) {
+    do {
+      if (!isset($this->SavedGroups[$alias])) { echo "Bad group name: $alias."; break; }
+      $groupPath = $this->SavedGroups[$alias];
+      $value = $this->result;
+      foreach ($groupPath as $k) {
+        $value = $value[$k];
+      }
+    } while (false);
+    return $value;
+  }
+
+  private function addArrayInline ($array, $indent) {
+      $CommonGroupPath = $this->path;
+      if (empty ($array)) return false;
+
+      foreach ($array as $k => $_) {
+        $this->addArray(array($k => $_), $indent);
+        $this->path = $CommonGroupPath;
+      }
+      return true;
+  }
+
+  private function addArray ($incoming_data, $incoming_indent) {
+
+   // print_r ($incoming_data);
+
+    if (count ($incoming_data) > 1)
+      return $this->addArrayInline ($incoming_data, $incoming_indent);
+
+    $key = key ($incoming_data);
+    $value = isset($incoming_data[$key]) ? $incoming_data[$key] : null;
+    if ($key === '__!YAMLZero') $key = '0';
+
+    if ($incoming_indent == 0 && !$this->_containsGroupAlias && !$this->_containsGroupAnchor) { // Shortcut for root-level values.
+      if ($key || $key === '' || $key === '0') {
+        $this->result[$key] = $value;
+      } else {
+        $this->result[] = $value; end ($this->result); $key = key ($this->result);
+      }
+      $this->path[$incoming_indent] = $key;
+      return;
+    }
+
+
+
+    $history = array();
+    // Unfolding inner array tree.
+    $history[] = $_arr = $this->result;
+    foreach ($this->path as $k) {
+      $history[] = $_arr = $_arr[$k];
+    }
+
+    if ($this->_containsGroupAlias) {
+      $value = $this->referenceContentsByAlias($this->_containsGroupAlias);
+      $this->_containsGroupAlias = false;
+    }
+
+
+    // Adding string or numeric key to the innermost level or $this->arr.
+    if (is_string($key) && $key == '<<') {
+      if (!is_array ($_arr)) { $_arr = array (); }
+
+      $_arr = array_merge ($_arr, $value);
+    } else if ($key || $key === '' || $key === '0') {
+      if (!is_array ($_arr))
+        $_arr = array ($key=>$value);
+      else
+        $_arr[$key] = $value;
+    } else {
+      if (!is_array ($_arr)) { $_arr = array ($value); $key = 0; }
+      else { $_arr[] = $value; end ($_arr); $key = key ($_arr); }
+    }
+
+    $reverse_path = array_reverse($this->path);
+    $reverse_history = array_reverse ($history);
+    $reverse_history[0] = $_arr;
+    $cnt = count($reverse_history) - 1;
+    for ($i = 0; $i < $cnt; $i++) {
+      $reverse_history[$i+1][$reverse_path[$i]] = $reverse_history[$i];
+    }
+    $this->result = $reverse_history[$cnt];
+
+    $this->path[$incoming_indent] = $key;
+
+    if ($this->_containsGroupAnchor) {
+      $this->SavedGroups[$this->_containsGroupAnchor] = $this->path;
+      if (is_array ($value)) {
+        $k = key ($value);
+        if (!is_int ($k)) {
+          $this->SavedGroups[$this->_containsGroupAnchor][$incoming_indent + 2] = $k;
+        }
+      }
+      $this->_containsGroupAnchor = false;
+    }
+
+  }
+
+  private static function startsLiteralBlock ($line) {
+    $lastChar = substr (trim($line), -1);
+    if ($lastChar != '>' && $lastChar != '|') return false;
+    if ($lastChar == '|') return $lastChar;
+    // HTML tags should not be counted as literal blocks.
+    if (preg_match ('#<.*?>$#', $line)) return false;
+    return $lastChar;
+  }
+
+  private static function greedilyNeedNextLine($line) {
+    $line = trim ($line);
+    if (!strlen($line)) return false;
+    if (substr ($line, -1, 1) == ']') return false;
+    if ($line[0] == '[') return true;
+    if (preg_match ('#^[^:]+?:\s*\[#', $line)) return true;
+    return false;
+  }
+
+  private function addLiteralLine ($literalBlock, $line, $literalBlockStyle, $indent = -1) {
+    $line = self::stripIndent($line, $indent);
+    if ($literalBlockStyle !== '|') {
+        $line = self::stripIndent($line);
+    }
+    $line = rtrim ($line, "\r\n\t ") . "\n";
+    if ($literalBlockStyle == '|') {
+      return $literalBlock . $line;
+    }
+    if (strlen($line) == 0)
+      return rtrim($literalBlock, ' ') . "\n";
+    if ($line == "\n" && $literalBlockStyle == '>') {
+      return rtrim ($literalBlock, " \t") . "\n";
+    }
+    if ($line != "\n")
+      $line = trim ($line, "\r\n ") . " ";
+    return $literalBlock . $line;
+  }
+
+   function revertLiteralPlaceHolder ($lineArray, $literalBlock) {
+     foreach ($lineArray as $k => $_) {
+      if (is_array($_))
+        $lineArray[$k] = $this->revertLiteralPlaceHolder ($_, $literalBlock);
+      else if (substr($_, -1 * strlen ($this->LiteralPlaceHolder)) == $this->LiteralPlaceHolder)
+	       $lineArray[$k] = rtrim ($literalBlock, " \r\n");
+     }
+     return $lineArray;
+   }
+
+  private static function stripIndent ($line, $indent = -1) {
+    if ($indent == -1) $indent = strlen($line) - strlen(ltrim($line));
+    return substr ($line, $indent);
+  }
+
+  private function getParentPathByIndent ($indent) {
+    if ($indent == 0) return array();
+    $linePath = $this->path;
+    do {
+      end($linePath); $lastIndentInParentPath = key($linePath);
+      if ($indent <= $lastIndentInParentPath) array_pop ($linePath);
+    } while ($indent <= $lastIndentInParentPath);
+    return $linePath;
+  }
+
+
+  private function clearBiggerPathValues ($indent) {
+
+
+    if ($indent == 0) $this->path = array();
+    if (empty ($this->path)) return true;
+
+    foreach ($this->path as $k => $_) {
+      if ($k > $indent) unset ($this->path[$k]);
+    }
+
+    return true;
+  }
+
+
+  private static function isComment ($line) {
+    if (!$line) return false;
+    if ($line[0] == '#') return true;
+    if (trim($line, " \r\n\t") == '---') return true;
+    return false;
+  }
+
+  private static function isEmpty ($line) {
+    return (trim ($line) === '');
+  }
+
+
+  private function isArrayElement ($line) {
+    if (!$line || !is_scalar($line)) return false;
+    if (substr($line, 0, 2) != '- ') return false;
+    if (strlen ($line) > 3)
+      if (substr($line,0,3) == '---') return false;
+
+    return true;
+  }
+
+  private function isHashElement ($line) {
+    return strpos($line, ':');
+  }
+
+  private function isLiteral ($line) {
+    if ($this->isArrayElement($line)) return false;
+    if ($this->isHashElement($line)) return false;
+    return true;
+  }
+
+
+  private static function unquote ($value) {
+    if (!$value) return $value;
+    if (!is_string($value)) return $value;
+    if ($value[0] == '\'') return trim ($value, '\'');
+    if ($value[0] == '"') return trim ($value, '"');
+    return $value;
+  }
+
+  private function startsMappedSequence ($line) {
+    return (substr($line, 0, 2) == '- ' && substr ($line, -1, 1) == ':');
+  }
+
+  private function returnMappedSequence ($line) {
+    $array = array();
+    $key         = self::unquote(trim(substr($line,1,-1)));
+    $array[$key] = array();
+    $this->delayedPath = array(strpos ($line, $key) + $this->indent => $key);
+    return array($array);
+  }
+
+  private function checkKeysInValue($value) {
+    if (strchr('[{"\'', $value[0]) === false) {
+      if (strchr($value, ': ') !== false) {
+          throw new Exception('Too many keys: '.$value);
+      }
+    }
+  }
+
+  private function returnMappedValue ($line) {
+    $this->checkKeysInValue($line);
+    $array = array();
+    $key         = self::unquote (trim(substr($line,0,-1)));
+    $array[$key] = '';
+    return $array;
+  }
+
+  private function startsMappedValue ($line) {
+    return (substr ($line, -1, 1) == ':');
+  }
+
+  private function isPlainArray ($line) {
+    return ($line[0] == '[' && substr ($line, -1, 1) == ']');
+  }
+
+  private function returnPlainArray ($line) {
+    return $this->_toType($line);
+  }
+
+  private function returnKeyValuePair ($line) {
+    $array = array();
+    $key = '';
+    if (strpos ($line, ': ')) {
+      // It's a key/value pair most likely
+      // If the key is in double quotes pull it out
+      if (($line[0] == '"' || $line[0] == "'") && preg_match('/^(["\'](.*)["\'](\s)*:)/',$line,$matches)) {
+        $value = trim(str_replace($matches[1],'',$line));
+        $key   = $matches[2];
+      } else {
+        // Do some guesswork as to the key and the value
+        $explode = explode(': ', $line);
+        $key     = trim(array_shift($explode));
+        $value   = trim(implode(': ', $explode));
+        $this->checkKeysInValue($value);
+      }
+      // Set the type of the value.  Int, string, etc
+      $value = $this->_toType($value);
+
+      if ($key === '0') $key = '__!YAMLZero';
+      $array[$key] = $value;
+    } else {
+      $array = array ($line);
+    }
+    return $array;
+
+  }
+
+
+  private function returnArrayElement ($line) {
+     if (strlen($line) <= 1) return array(array()); // Weird %)
+     $array = array();
+     $value   = trim(substr($line,1));
+     $value   = $this->_toType($value);
+     if ($this->isArrayElement($value)) {
+       $value = $this->returnArrayElement($value);
+     }
+     $array[] = $value;
+     return $array;
+  }
+
+
+  private function nodeContainsGroup ($line) {
+    $symbolsForReference = 'A-z0-9_\-';
+    if (strpos($line, '&') === false && strpos($line, '*') === false) return false; // Please die fast ;-)
+    if ($line[0] == '&' && preg_match('/^(&['.$symbolsForReference.']+)/', $line, $matches)) return $matches[1];
+    if ($line[0] == '*' && preg_match('/^(\*['.$symbolsForReference.']+)/', $line, $matches)) return $matches[1];
+    if (preg_match('/(&['.$symbolsForReference.']+)$/', $line, $matches)) return $matches[1];
+    if (preg_match('/(\*['.$symbolsForReference.']+$)/', $line, $matches)) return $matches[1];
+    if (preg_match ('#^\s*<<\s*:\s*(\*[^\s]+).*$#', $line, $matches)) return $matches[1];
+    return false;
+
+  }
+
+  private function addGroup ($line, $group) {
+    if ($group[0] == '&') $this->_containsGroupAnchor = substr ($group, 1);
+    if ($group[0] == '*') $this->_containsGroupAlias = substr ($group, 1);
+    //print_r ($this->path);
+  }
+
+  private function stripGroup ($line, $group) {
+    $line = trim(str_replace($group, '', $line));
+    return $line;
+  }
+}
+}
+
+// Enable use of Spyc from command line
+// The syntax is the following: php Spyc.php spyc.yaml
+
+do {
+  if (PHP_SAPI != 'cli') break;
+  if (empty ($_SERVER['argc']) || $_SERVER['argc'] < 2) break;
+  if (empty ($_SERVER['PHP_SELF']) || FALSE === strpos ($_SERVER['PHP_SELF'], 'Spyc.php') ) break;
+  $file = $argv[1];
+  echo json_encode (spyc_load_file ($file));
+} while (0);
diff --git a/DieJudoGürtelprüfung/lib/lite-youtube-embed b/DieJudoGürtelprüfung/lib/lite-youtube-embed
new file mode 120000
index 0000000..f98fa2d
--- /dev/null
+++ b/DieJudoGürtelprüfung/lib/lite-youtube-embed
@@ -0,0 +1 @@
+../../submodules/lite-youtube-embed/src/
\ No newline at end of file
diff --git a/DieJudoGürtelprüfung/markdown/4terKyu/01-Ukemi/01-FreierFall.md b/DieJudoGürtelprüfung/markdown/4terKyu/01-Ukemi/01-FreierFall.md
new file mode 100644
index 0000000..8826f7f
--- /dev/null
+++ b/DieJudoGürtelprüfung/markdown/4terKyu/01-Ukemi/01-FreierFall.md
@@ -0,0 +1,7 @@
+---
+title: "Tsuri-komi-goshi"
+youtube:
+    videoid: "TE992jTbkek"
+    from: 25
+    to: 44
+---
diff --git a/DieJudoGürtelprüfung/markdown/4terKyu/01-Ukemi/meta.yaml b/DieJudoGürtelprüfung/markdown/4terKyu/01-Ukemi/meta.yaml
new file mode 100644
index 0000000..182dc7e
--- /dev/null
+++ b/DieJudoGürtelprüfung/markdown/4terKyu/01-Ukemi/meta.yaml
@@ -0,0 +1,3 @@
+---
+title: "Falltechnik"
+---
diff --git a/DieJudoGürtelprüfung/markdown/4terKyu/02-NageWaza-Grundform/01-TsuriKomiGoshi.md b/DieJudoGürtelprüfung/markdown/4terKyu/02-NageWaza-Grundform/01-TsuriKomiGoshi.md
new file mode 100644
index 0000000..9cc5f12
--- /dev/null
+++ b/DieJudoGürtelprüfung/markdown/4terKyu/02-NageWaza-Grundform/01-TsuriKomiGoshi.md
@@ -0,0 +1,7 @@
+---
+title: "Tsuri-komi-goshi"
+youtube:
+    videoid: "TE992jTbkek"
+    from: 53
+    to: 89
+---
diff --git a/DieJudoGürtelprüfung/markdown/4terKyu/02-NageWaza-Grundform/02-Koshi-uchi-mata.md b/DieJudoGürtelprüfung/markdown/4terKyu/02-NageWaza-Grundform/02-Koshi-uchi-mata.md
new file mode 100644
index 0000000..16697ac
--- /dev/null
+++ b/DieJudoGürtelprüfung/markdown/4terKyu/02-NageWaza-Grundform/02-Koshi-uchi-mata.md
@@ -0,0 +1,7 @@
+---
+title: "Koshi-uchi-mata"
+youtube:
+    videoid: "TE992jTbkek"
+    from: 89
+    to: 118
+---
diff --git a/DieJudoGürtelprüfung/markdown/4terKyu/02-NageWaza-Grundform/03-O-uchi-barai.md b/DieJudoGürtelprüfung/markdown/4terKyu/02-NageWaza-Grundform/03-O-uchi-barai.md
new file mode 100644
index 0000000..96d9112
--- /dev/null
+++ b/DieJudoGürtelprüfung/markdown/4terKyu/02-NageWaza-Grundform/03-O-uchi-barai.md
@@ -0,0 +1,7 @@
+---
+title: "O-uchi-barei"
+youtube:
+    videoid: "TE992jTbkek"
+    from: 118
+    to: 138
+---
diff --git a/DieJudoGürtelprüfung/markdown/4terKyu/02-NageWaza-Grundform/04-Ko-uchi-barai.md b/DieJudoGürtelprüfung/markdown/4terKyu/02-NageWaza-Grundform/04-Ko-uchi-barai.md
new file mode 100644
index 0000000..fe44a34
--- /dev/null
+++ b/DieJudoGürtelprüfung/markdown/4terKyu/02-NageWaza-Grundform/04-Ko-uchi-barai.md
@@ -0,0 +1,7 @@
+---
+title: "Ko-uchi-barei"
+youtube:
+    videoid: "TE992jTbkek"
+    from: 138
+    to: 162
+---
diff --git a/DieJudoGürtelprüfung/markdown/4terKyu/02-NageWaza-Grundform/05-Ko-uchi-maki-komi.md b/DieJudoGürtelprüfung/markdown/4terKyu/02-NageWaza-Grundform/05-Ko-uchi-maki-komi.md
new file mode 100644
index 0000000..37b6c3b
--- /dev/null
+++ b/DieJudoGürtelprüfung/markdown/4terKyu/02-NageWaza-Grundform/05-Ko-uchi-maki-komi.md
@@ -0,0 +1,7 @@
+---
+title: "Ko-uchi-maki-komi"
+youtube:
+    videoid: "TE992jTbkek"
+    from: 162
+    to: 185
+---
diff --git a/DieJudoGürtelprüfung/markdown/4terKyu/02-NageWaza-Grundform/06-Tomoe-nage.md b/DieJudoGürtelprüfung/markdown/4terKyu/02-NageWaza-Grundform/06-Tomoe-nage.md
new file mode 100644
index 0000000..8a5610b
--- /dev/null
+++ b/DieJudoGürtelprüfung/markdown/4terKyu/02-NageWaza-Grundform/06-Tomoe-nage.md
@@ -0,0 +1,7 @@
+---
+title: "Tomoe-nage"
+youtube:
+    videoid: "TE992jTbkek"
+    from: 185
+    to: 209
+---
diff --git a/DieJudoGürtelprüfung/markdown/4terKyu/02-NageWaza-Grundform/07-Yoko-tomoe-nage.md b/DieJudoGürtelprüfung/markdown/4terKyu/02-NageWaza-Grundform/07-Yoko-tomoe-nage.md
new file mode 100644
index 0000000..3377e37
--- /dev/null
+++ b/DieJudoGürtelprüfung/markdown/4terKyu/02-NageWaza-Grundform/07-Yoko-tomoe-nage.md
@@ -0,0 +1,7 @@
+---
+title: "Yoko-tomoe-nage"
+youtube:
+    videoid: "TE992jTbkek"
+    from: 209
+    to: 233
+---
diff --git a/DieJudoGürtelprüfung/markdown/4terKyu/02-NageWaza-Grundform/meta.yaml b/DieJudoGürtelprüfung/markdown/4terKyu/02-NageWaza-Grundform/meta.yaml
new file mode 100644
index 0000000..87c601a
--- /dev/null
+++ b/DieJudoGürtelprüfung/markdown/4terKyu/02-NageWaza-Grundform/meta.yaml
@@ -0,0 +1,3 @@
+---
+title: "Grundform der Wurftechnik"
+---
diff --git a/DieJudoGürtelprüfung/markdown/4terKyu/03-NeWaza-Grundform/01-UdeGatame.md b/DieJudoGürtelprüfung/markdown/4terKyu/03-NeWaza-Grundform/01-UdeGatame.md
new file mode 100644
index 0000000..8fab769
--- /dev/null
+++ b/DieJudoGürtelprüfung/markdown/4terKyu/03-NeWaza-Grundform/01-UdeGatame.md
@@ -0,0 +1,7 @@
+---
+title: "Ude-gatame"
+youtube:
+    videoid: "TE992jTbkek"
+    from: 233
+    to: 254
+---
diff --git a/DieJudoGürtelprüfung/markdown/4terKyu/03-NeWaza-Grundform/02-WakiGatame.md b/DieJudoGürtelprüfung/markdown/4terKyu/03-NeWaza-Grundform/02-WakiGatame.md
new file mode 100644
index 0000000..1fd1576
--- /dev/null
+++ b/DieJudoGürtelprüfung/markdown/4terKyu/03-NeWaza-Grundform/02-WakiGatame.md
@@ -0,0 +1,7 @@
+---
+title: "Ude-gatame"
+youtube:
+    videoid: "TE992jTbkek"
+    from: 254
+    to: 276
+---
diff --git a/DieJudoGürtelprüfung/markdown/4terKyu/03-NeWaza-Grundform/meta.yaml b/DieJudoGürtelprüfung/markdown/4terKyu/03-NeWaza-Grundform/meta.yaml
new file mode 100644
index 0000000..36f8ed7
--- /dev/null
+++ b/DieJudoGürtelprüfung/markdown/4terKyu/03-NeWaza-Grundform/meta.yaml
@@ -0,0 +1,3 @@
+---
+title: "Grundform der Bodentechniken"
+---
\ No newline at end of file
diff --git a/DieJudoGürtelprüfung/markdown/4terKyu/04-TachiWaza-Anwendung/01-TsuriKomiGoshiKenkaYotsu.md b/DieJudoGürtelprüfung/markdown/4terKyu/04-TachiWaza-Anwendung/01-TsuriKomiGoshiKenkaYotsu.md
new file mode 100644
index 0000000..b7e0d9b
--- /dev/null
+++ b/DieJudoGürtelprüfung/markdown/4terKyu/04-TachiWaza-Anwendung/01-TsuriKomiGoshiKenkaYotsu.md
@@ -0,0 +1,7 @@
+---
+title: "Tsuri-komi-goshi aus gegenleichem Griff werfen"
+youtube:
+    videoid: "TE992jTbkek"
+    from: 276
+    to: 304
+---
diff --git a/DieJudoGürtelprüfung/markdown/4terKyu/04-TachiWaza-Anwendung/02-KoshiUchiMataKenkaYotsu.md b/DieJudoGürtelprüfung/markdown/4terKyu/04-TachiWaza-Anwendung/02-KoshiUchiMataKenkaYotsu.md
new file mode 100644
index 0000000..77bb167
--- /dev/null
+++ b/DieJudoGürtelprüfung/markdown/4terKyu/04-TachiWaza-Anwendung/02-KoshiUchiMataKenkaYotsu.md
@@ -0,0 +1,7 @@
+---
+title: "oder Koshi-uchi-mata aus gegenleichem Griff werfen"
+youtube:
+    videoid: "TE992jTbkek"
+    from: 304
+    to: 336
+---
diff --git a/DieJudoGürtelprüfung/markdown/4terKyu/04-TachiWaza-Anwendung/03-TomoeNage.md b/DieJudoGürtelprüfung/markdown/4terKyu/04-TachiWaza-Anwendung/03-TomoeNage.md
new file mode 100644
index 0000000..f8d9bf8
--- /dev/null
+++ b/DieJudoGürtelprüfung/markdown/4terKyu/04-TachiWaza-Anwendung/03-TomoeNage.md
@@ -0,0 +1,7 @@
+---
+title: "zwei der anderen vier Techniken aus einer sinnvollen Ausgangsituation werfen, z.B. Tomoe-nage"
+youtube:
+    videoid: "TE992jTbkek"
+    from: 304
+    to: 336
+---
diff --git a/DieJudoGürtelprüfung/markdown/4terKyu/04-TachiWaza-Anwendung/04-OUchiBarei.md b/DieJudoGürtelprüfung/markdown/4terKyu/04-TachiWaza-Anwendung/04-OUchiBarei.md
new file mode 100644
index 0000000..7c9f791
--- /dev/null
+++ b/DieJudoGürtelprüfung/markdown/4terKyu/04-TachiWaza-Anwendung/04-OUchiBarei.md
@@ -0,0 +1,7 @@
+---
+title: "zwei der anderen vier Techniken aus einer sinnvollen Ausgangsituation werfen, z.B. O-uchi-barei"
+youtube:
+    videoid: "TE992jTbkek"
+    from: 336
+    to: 401
+---
diff --git a/DieJudoGürtelprüfung/markdown/4terKyu/04-TachiWaza-Anwendung/05-VerteidigenDurchBlocken.md b/DieJudoGürtelprüfung/markdown/4terKyu/04-TachiWaza-Anwendung/05-VerteidigenDurchBlocken.md
new file mode 100644
index 0000000..a16d7f2
--- /dev/null
+++ b/DieJudoGürtelprüfung/markdown/4terKyu/04-TachiWaza-Anwendung/05-VerteidigenDurchBlocken.md
@@ -0,0 +1,7 @@
+---
+title: "Verteidigen durch Blocken gegen zwei verschiedene Eindrehtechniken"
+youtube:
+    videoid: "TE992jTbkek"
+    from: 401
+    to: 433
+---
diff --git a/DieJudoGürtelprüfung/markdown/4terKyu/04-TachiWaza-Anwendung/meta.yaml b/DieJudoGürtelprüfung/markdown/4terKyu/04-TachiWaza-Anwendung/meta.yaml
new file mode 100644
index 0000000..66dbbd4
--- /dev/null
+++ b/DieJudoGürtelprüfung/markdown/4terKyu/04-TachiWaza-Anwendung/meta.yaml
@@ -0,0 +1,3 @@
+---
+title: "Anwendungsaufgabe Stand"
+---
\ No newline at end of file
diff --git a/DieJudoGürtelprüfung/markdown/4terKyu/05-NeWaza-Anwendung/01-UdeGatameAusRueckenlage.md b/DieJudoGürtelprüfung/markdown/4terKyu/05-NeWaza-Anwendung/01-UdeGatameAusRueckenlage.md
new file mode 100644
index 0000000..1a1149f
--- /dev/null
+++ b/DieJudoGürtelprüfung/markdown/4terKyu/05-NeWaza-Anwendung/01-UdeGatameAusRueckenlage.md
@@ -0,0 +1,7 @@
+---
+title: "Aus der eigenen Rückenlage (Uke zw. Toris Beinen) Ude-gatame ausführen"
+youtube:
+    videoid: "TE992jTbkek"
+    from: 433
+    to: 451
+---
diff --git a/DieJudoGürtelprüfung/markdown/4terKyu/05-NeWaza-Anwendung/02-JujiGatameAusRueckenlage.md b/DieJudoGürtelprüfung/markdown/4terKyu/05-NeWaza-Anwendung/02-JujiGatameAusRueckenlage.md
new file mode 100644
index 0000000..81b33d5
--- /dev/null
+++ b/DieJudoGürtelprüfung/markdown/4terKyu/05-NeWaza-Anwendung/02-JujiGatameAusRueckenlage.md
@@ -0,0 +1,7 @@
+---
+title: "Oder aus der eigenen Rückenlage (Uke zw. Toris Beinen) Juji-gatame ausführen"
+youtube:
+    videoid: "TE992jTbkek"
+    from: 451
+    to: 482
+---
diff --git a/DieJudoGürtelprüfung/markdown/4terKyu/05-NeWaza-Anwendung/03-UdeGatameAusKuzureKesaGatame.md b/DieJudoGürtelprüfung/markdown/4terKyu/05-NeWaza-Anwendung/03-UdeGatameAusKuzureKesaGatame.md
new file mode 100644
index 0000000..72e68e4
--- /dev/null
+++ b/DieJudoGürtelprüfung/markdown/4terKyu/05-NeWaza-Anwendung/03-UdeGatameAusKuzureKesaGatame.md
@@ -0,0 +1,7 @@
+---
+title: "Aus Kuzure-kesa-gatame Ude-gatame ausführen"
+youtube:
+    videoid: "TE992jTbkek"
+    from: 482
+    to: 505
+---
diff --git a/DieJudoGürtelprüfung/markdown/4terKyu/05-NeWaza-Anwendung/04-WakiGatameAusKuzureKesaGatame.md b/DieJudoGürtelprüfung/markdown/4terKyu/05-NeWaza-Anwendung/04-WakiGatameAusKuzureKesaGatame.md
new file mode 100644
index 0000000..ec1e0d9
--- /dev/null
+++ b/DieJudoGürtelprüfung/markdown/4terKyu/05-NeWaza-Anwendung/04-WakiGatameAusKuzureKesaGatame.md
@@ -0,0 +1,7 @@
+---
+title: "Aus Kuzure-kesa-gatame Waki-gatame ausführen"
+youtube:
+    videoid: "TE992jTbkek"
+    from: 505
+    to: 522
+---
diff --git a/DieJudoGürtelprüfung/markdown/4terKyu/05-NeWaza-Anwendung/05-WakiAusBank.md b/DieJudoGürtelprüfung/markdown/4terKyu/05-NeWaza-Anwendung/05-WakiAusBank.md
new file mode 100644
index 0000000..293a62e
--- /dev/null
+++ b/DieJudoGürtelprüfung/markdown/4terKyu/05-NeWaza-Anwendung/05-WakiAusBank.md
@@ -0,0 +1,7 @@
+---
+title: "Aus der eigenen Bankposition zu Waki-gatame kommen"
+youtube:
+    videoid: "TE992jTbkek"
+    from: 522
+    to: 543
+---
diff --git a/DieJudoGürtelprüfung/markdown/4terKyu/05-NeWaza-Anwendung/06-FesthalteAusBank.md b/DieJudoGürtelprüfung/markdown/4terKyu/05-NeWaza-Anwendung/06-FesthalteAusBank.md
new file mode 100644
index 0000000..8b4615d
--- /dev/null
+++ b/DieJudoGürtelprüfung/markdown/4terKyu/05-NeWaza-Anwendung/06-FesthalteAusBank.md
@@ -0,0 +1,7 @@
+---
+title: "oder aus der eigenen Bankposition zu einem Haltegriff kommen"
+youtube:
+    videoid: "TE992jTbkek"
+    from: 543
+    to: 563
+---
diff --git a/DieJudoGürtelprüfung/markdown/4terKyu/05-NeWaza-Anwendung/meta.yaml b/DieJudoGürtelprüfung/markdown/4terKyu/05-NeWaza-Anwendung/meta.yaml
new file mode 100644
index 0000000..3577112
--- /dev/null
+++ b/DieJudoGürtelprüfung/markdown/4terKyu/05-NeWaza-Anwendung/meta.yaml
@@ -0,0 +1,3 @@
+---
+title: "Anwendungsaufgabe Boden"
+---
\ No newline at end of file
diff --git a/DieJudoGürtelprüfung/markdown/4terKyu/06-Randori/01-Randori.md b/DieJudoGürtelprüfung/markdown/4terKyu/06-Randori/01-Randori.md
new file mode 100644
index 0000000..2ae16bb
--- /dev/null
+++ b/DieJudoGürtelprüfung/markdown/4terKyu/06-Randori/01-Randori.md
@@ -0,0 +1,9 @@
+---
+title: "Randori"
+youtube:
+    videoid: "TE992jTbkek"
+    from: 563
+    to: 771
+---
+- Im Standrandori die erlernten Würfe aus verschiedenen Griffen und nach Lösen des gegnerischen Griffes (am Ärmel und am Revers) werfen (**Randori spielen!**)
+- Beim Übergang vom Stand zum Boden die Chance zum erfolgreichen Angriff oder zur notwendigen Verteidigung nutzten
diff --git a/DieJudoGürtelprüfung/markdown/4terKyu/06-Randori/meta.yaml b/DieJudoGürtelprüfung/markdown/4terKyu/06-Randori/meta.yaml
new file mode 100644
index 0000000..89af6d4
--- /dev/null
+++ b/DieJudoGürtelprüfung/markdown/4terKyu/06-Randori/meta.yaml
@@ -0,0 +1,3 @@
+---
+title: "Randori"
+---
\ No newline at end of file
diff --git a/DieJudoGürtelprüfung/markdown/4terKyu/07-Lexikon/01-Lexikon.md b/DieJudoGürtelprüfung/markdown/4terKyu/07-Lexikon/01-Lexikon.md
new file mode 100644
index 0000000..0d53c9f
--- /dev/null
+++ b/DieJudoGürtelprüfung/markdown/4terKyu/07-Lexikon/01-Lexikon.md
@@ -0,0 +1,18 @@
+---
+title: "Lexikon/neue japanische Begriffe"
+---
+|  Nr. |         Japanisch | Deutsch                                      |
+| ---: | ----------------: | :------------------------------------------- |
+|   36 |   Koshi-uchi-mata | Innerer Schenkelwurf mit der Hüfte           |
+|   37 |     Ko-uchi-barai | Kleines inneres Fegen                        |
+|   38 | Ko-uchi-maki-komi | Kleines Einrollen von innen                  |
+|   39 |      O-uchi-barai | Großes Inneres fegen                         |
+|   40 |       Sutemi-waza | "Opfertechniken", Selbstfallwürfe            |
+|   41 |  Tsuri-komi-goshi | Hebezughüftwurf                              |
+|   42 |        Tomoe-nage | wörtl. „Wirbelwurf“, Kopfwurf                |
+|   43 |        Ude-gatame | Mit beiden Händen auf den Ellenbogen drücken |
+|   44 |       Waki-gatame | Mit der Körperseite hebeln                   |
+|   45 |   Yoko-tomoe-nage | Seitlicher Kopfwurf; „Wirbelwurf“ zur Seite  |
+|   46 |           Kuzushi | Gleichgewicht brechen                        |
+|   47 |           Tsukuri | Annäherung, Wurfansatz                       |
+|   48 |              Kake | Wurfausführung und Kontrolle                 |
diff --git a/DieJudoGürtelprüfung/markdown/4terKyu/07-Lexikon/meta.yaml b/DieJudoGürtelprüfung/markdown/4terKyu/07-Lexikon/meta.yaml
new file mode 100644
index 0000000..2e023cb
--- /dev/null
+++ b/DieJudoGürtelprüfung/markdown/4terKyu/07-Lexikon/meta.yaml
@@ -0,0 +1,3 @@
+---
+title: "Lexikon"
+---
\ No newline at end of file
diff --git a/DieJudoGürtelprüfung/markdown/4terKyu/meta.yaml b/DieJudoGürtelprüfung/markdown/4terKyu/meta.yaml
new file mode 100644
index 0000000..144cd7b
--- /dev/null
+++ b/DieJudoGürtelprüfung/markdown/4terKyu/meta.yaml
@@ -0,0 +1,3 @@
+---
+title: "4. Kyu - orange-grüner Gürtel"
+---
\ No newline at end of file
diff --git a/DieJudoGürtelprüfung/markdown/5terKyu/01-Ukemi/01-Ushiro.md b/DieJudoGürtelprüfung/markdown/5terKyu/01-Ukemi/01-Ushiro.md
new file mode 100644
index 0000000..1194835
--- /dev/null
+++ b/DieJudoGürtelprüfung/markdown/5terKyu/01-Ukemi/01-Ushiro.md
@@ -0,0 +1,8 @@
+---
+title: Fallen rückwärts
+video:
+    url: "videos/8terKyu/Ukemi/Ushiro.webm"
+    width: 854
+    height: 480 
+---
+Fallen rückwärts soll in dieser Stufe gut beherrscht werden.
diff --git a/DieJudoGürtelprüfung/markdown/5terKyu/01-Ukemi/02-Yoko.md b/DieJudoGürtelprüfung/markdown/5terKyu/01-Ukemi/02-Yoko.md
new file mode 100644
index 0000000..403fefe
--- /dev/null
+++ b/DieJudoGürtelprüfung/markdown/5terKyu/01-Ukemi/02-Yoko.md
@@ -0,0 +1,8 @@
+---
+title: Fallen seitwärts zu beiden Seiten
+video:
+    url: "videos/8terKyu/Ukemi/Yoko.webm"
+    width: 854
+    height: 480
+---
+Fallen seitwärts zu beiden Seiten soll in dieser Stufe gut beherrscht werden.
diff --git a/DieJudoGürtelprüfung/markdown/5terKyu/01-Ukemi/03-MaeMawari.md b/DieJudoGürtelprüfung/markdown/5terKyu/01-Ukemi/03-MaeMawari.md
new file mode 100644
index 0000000..9e3c3c4
--- /dev/null
+++ b/DieJudoGürtelprüfung/markdown/5terKyu/01-Ukemi/03-MaeMawari.md
@@ -0,0 +1,17 @@
+---
+title: Judorolle vorwärts beidseitig über ein Hindernis
+video:
+    url: "videos/5terKyu/Ukemi/MaeMawari.webm"
+    width: 854
+    height: 480
+---
+## Stichpunkte
+
+- über beide Arme stützen
+- rund über ein Hindernis rollen, ohne dies zu berühren
+  - z.B. Medizinball oder tiefe Partnerbank
+- zu beiden Seiten
+
+## Anmerkungen
+
+Fallen rückwärts und seitwärts zu beiden Seiten wird jetzt gut beherrscht. Die Judorolle über ein Hindernis (z.B. Medizinball, Gürtel oder Partner) soll die Sicherheit der Falltechnik vorwärts vertiefen und eine höhere und weitere Rollbewegung veranlassen.
diff --git a/DieJudoGürtelprüfung/markdown/5terKyu/01-Ukemi/meta.yaml b/DieJudoGürtelprüfung/markdown/5terKyu/01-Ukemi/meta.yaml
new file mode 100644
index 0000000..f2bd558
--- /dev/null
+++ b/DieJudoGürtelprüfung/markdown/5terKyu/01-Ukemi/meta.yaml
@@ -0,0 +1,3 @@
+---
+title: "Falltechniken"
+---
\ No newline at end of file
diff --git a/DieJudoGürtelprüfung/markdown/5terKyu/02-NageWaza-Grundform/01-MoroteSeoiNage.md b/DieJudoGürtelprüfung/markdown/5terKyu/02-NageWaza-Grundform/01-MoroteSeoiNage.md
new file mode 100644
index 0000000..fe6c653
--- /dev/null
+++ b/DieJudoGürtelprüfung/markdown/5terKyu/02-NageWaza-Grundform/01-MoroteSeoiNage.md
@@ -0,0 +1,20 @@
+---
+title: "Morote-seoi-nage"
+video:
+    url: "videos/5terKyu/NageWaza/MoroteSeoiNage.webm"
+    width: 854
+    height: 480
+---
+## Stichpunkte
+
+- Ärmel-Revers-Griff
+- Partner aufziehen
+- durch beugen der Beine unter den Schwerpunkt kommen
+- sicherer, breitbeiniger Stand
+- Rücken-Bauch-Kontakt
+- kontrolliertes Werfen durch Ausheben über die Schulter
+- Uke sichern
+
+## Anmerkungen
+
+Morote-seoi-nage soll den wichtigen Ärmel-Revers-Griff und den differenzierten Einsatz von Hub- und Zugarm weiter verbessern. Das Tiefgehen und Strecken der Beine erfordert besondere Kraft, die hier auch mittrainiert wird.
diff --git a/DieJudoGürtelprüfung/markdown/5terKyu/02-NageWaza-Grundform/02-SasaeTsuriKomiAshiHizaGuruma.md b/DieJudoGürtelprüfung/markdown/5terKyu/02-NageWaza-Grundform/02-SasaeTsuriKomiAshiHizaGuruma.md
new file mode 100644
index 0000000..f3cd214
--- /dev/null
+++ b/DieJudoGürtelprüfung/markdown/5terKyu/02-NageWaza-Grundform/02-SasaeTsuriKomiAshiHizaGuruma.md
@@ -0,0 +1,20 @@
+---
+title: "Sasae-tsuri-komi-ashi oder Hiza-guruma"
+video:
+    url: "videos/5terKyu/NageWaza/SasaeTsuriKomiAshiHizaGuruma.webm"
+    width: 854
+    height: 480
+---
+## Stichpunkte
+
+- starker Zug in leichter Rotation
+- Schulter-Arm-Falten-Griff
+- Blockieren mit der Fußsohle am Schienbein oder Knie
+- Kontrolliertes Werfen über das blockierende Bein
+- Uke sichern
+
+## Anmerkungen
+
+Uke kann zunächst um/über die Blockade Stürzen und von Mal zu Mal dynamischer und aus größerer Höhe fallen. Mit dem **Schulter-Arm-Falten-Griff** ist der Griff um die Schulter herum in die Jackenfalte am Rücken gemeint. Durch diesen Griff kann Uke durch Zug leichter gedreht werden.
+
+In dieser Stufe sollte eine Technik zur anderen Seite gezeigt werden. Wir empfehlen Sasae-tsuri-komi-ashi oder Hiza-guruma.
diff --git a/DieJudoGürtelprüfung/markdown/5terKyu/02-NageWaza-Grundform/03-OkuriAshiBarei.md b/DieJudoGürtelprüfung/markdown/5terKyu/02-NageWaza-Grundform/03-OkuriAshiBarei.md
new file mode 100644
index 0000000..4af30ac
--- /dev/null
+++ b/DieJudoGürtelprüfung/markdown/5terKyu/02-NageWaza-Grundform/03-OkuriAshiBarei.md
@@ -0,0 +1,19 @@
+---
+title: "Okuri-ashi-barei"
+video:
+    url: "videos/5terKyu/NageWaza/OkuriAshiBarei.webm"
+    width: 854
+    height: 480
+---
+## Stichpunkte
+
+- aus der Seitwärtsbewegung oder dem Seitgalopp
+- Rhythmus aufbauen
+- Fußsohle-Knöchel-Kontakt
+- das gefegte Bein an das andere heranführen
+- weiterfegen und Uke sichern
+- üben zu beiden Seiten, geprüft wird nur eine Seite
+
+## Anmerkungen
+
+Der Schwerpunkt dieser Stufe liegt eindeutig auf Techniken, die auf einem Bein stehend ausgeführt werden. Tori muss die Kontrolle über Uke durch sicheren Stand nach der Wurfausführung sicherstellen. Auch bei der Demonstration der Grundform sollte auf dieser Ausbildungsstufe das Ausnutzen von Bewegung bei der Wurfausführung im Mittelpunkt stehen.
diff --git a/DieJudoGürtelprüfung/markdown/5terKyu/02-NageWaza-Grundform/04-OSotoGari.md b/DieJudoGürtelprüfung/markdown/5terKyu/02-NageWaza-Grundform/04-OSotoGari.md
new file mode 100644
index 0000000..7f5c29d
--- /dev/null
+++ b/DieJudoGürtelprüfung/markdown/5terKyu/02-NageWaza-Grundform/04-OSotoGari.md
@@ -0,0 +1,19 @@
+---
+title: "O-soto-gari"
+video:
+    url: "videos/5terKyu/NageWaza/OSotoGari.webm"
+    width: 854
+    height: 480
+---
+## Stichpunkte
+
+- großer Schritt nach schräg außen
+- Seite-Seite-Kontakt
+- sicherer Stand auf einem Bein
+- kontrolliertes Werfen durch Rückschwung des bis in die Zehenspitzen fast gestreckten Beines
+- Uke sichern
+- üben zu beiden Seiten geprüft wird nur eine
+
+## Anmerkungen
+
+O-soto-gari unterscheidet sich nur wenig von dem folgenden Harai-goshi. Man kann Uke klassisch nach hinten oder - wie hier gezeigt - aus gegengleicher Auslage schräg seitlich nach hinten werfen. In der Praxis des Randoris oder gar Wettkämpfen vermischen sich situationsabhängig beide Techniken schon mal.
diff --git a/DieJudoGürtelprüfung/markdown/5terKyu/02-NageWaza-Grundform/05-HaraiGoshi.md b/DieJudoGürtelprüfung/markdown/5terKyu/02-NageWaza-Grundform/05-HaraiGoshi.md
new file mode 100644
index 0000000..f2c378a
--- /dev/null
+++ b/DieJudoGürtelprüfung/markdown/5terKyu/02-NageWaza-Grundform/05-HaraiGoshi.md
@@ -0,0 +1,17 @@
+---
+title: "Harai-goshi"
+video:
+    url: "videos/5terKyu/NageWaza/HaraiGoshi.webm"
+    width: 854
+    height: 480
+---
+## Stichpunkte
+
+- starker Zug
+- rückwärts eindrehen und weiterziehen
+- Rücken-Bauch-Kontakt
+- kontrolliertes Werfen durch Rückschwung des bis in die Zehenspitzen fast gestreckten Beines
+
+## Anmerkungen
+
+Harai-goshi kann auch mit anderen Griffvarianten geübt und in der Prüfung gezeigt werden. Zur Erleichterung kann die Hubhand (Tsuri-te) auch unter den Arm auf den Rücken oder über der Schulter in den Nacken greifen. Aus gegengleicher Auslage (Kenka-yotsu) kann auch ein Doppelreversgriff sinnvoll sein. Der her gezeigte Ärmel-Revers-Griff ist die schwierigste Variante, soll aber das Ziel sein. Die Zughand (Hiki-te) soll aber bei allen Varianten weiter nach vorne ziehen.
diff --git a/DieJudoGürtelprüfung/markdown/5terKyu/02-NageWaza-Grundform/meta.yaml b/DieJudoGürtelprüfung/markdown/5terKyu/02-NageWaza-Grundform/meta.yaml
new file mode 100644
index 0000000..87c601a
--- /dev/null
+++ b/DieJudoGürtelprüfung/markdown/5terKyu/02-NageWaza-Grundform/meta.yaml
@@ -0,0 +1,3 @@
+---
+title: "Grundform der Wurftechnik"
+---
diff --git a/DieJudoGürtelprüfung/markdown/5terKyu/03-NeWaza-Grundform/01-JujiGatame.md b/DieJudoGürtelprüfung/markdown/5terKyu/03-NeWaza-Grundform/01-JujiGatame.md
new file mode 100644
index 0000000..0f74909
--- /dev/null
+++ b/DieJudoGürtelprüfung/markdown/5terKyu/03-NeWaza-Grundform/01-JujiGatame.md
@@ -0,0 +1,18 @@
+---
+title: "Juji-gatame"
+video:
+    url: "videos/5terKyu/KansetsuWaza/JujiGatame.webm"
+    width: 854
+    height: 480
+---
+## Stichpunkte
+
+- Füße sicher geschlossen
+- dicht am Partner sitzen
+- Ukes Unterarm Richtung Kopf strecken
+- behutsam kontrolliert hebeln
+- Uke soll frühzeitig abschlagen
+
+## Anmerkungen
+
+Uke muss bei allen Armhebeln unbedingt zum Eigenschutz eine Gegenspannung aufbauen. So lernt Tori gleichzeitig das behutsame Hebeln. Die hier gezeigte Variante von Juji-gatame kann auch durch andere Varianten (nur ein Bein kreuzt Uke, keine sicher geschlossenen Füße, geschlossene Knie etc.) ausgetauscht werden. Wer die Technik sicher beherrscht, kann sie in der Prüfung auch direkt aus einer sinnvollen Ausgangssituation zeigen und somit einen Teil der Anwendungsaufgabe vorweg nehmen.
diff --git a/DieJudoGürtelprüfung/markdown/5terKyu/03-NeWaza-Grundform/02-UdeGarami.md b/DieJudoGürtelprüfung/markdown/5terKyu/03-NeWaza-Grundform/02-UdeGarami.md
new file mode 100644
index 0000000..700db7b
--- /dev/null
+++ b/DieJudoGürtelprüfung/markdown/5terKyu/03-NeWaza-Grundform/02-UdeGarami.md
@@ -0,0 +1,18 @@
+---
+title: "Ude-garami"
+video:
+    url: "videos/5terKyu/KansetsuWaza/UdeGarami.webm"
+    width: 854
+    height: 480
+---
+## Stichpunkte
+
+- quer über Uke liegend
+- Griff an Ukes Handgelenk
+- Griff unter Ukes Oberarm auf das eigene Handgelenk
+- behutsames, kontrolliertes Hebeln durch Verdrehen der eigenen Arme
+- Uke soll frühzeitig abschlagen.
+
+## Anmerkungen
+
+Ude-garami wird seit Jahrzehnten bei uns als **Armbeugehebel** bezeichnet. Dies wollen wir auch nicht ändern, obwohl "garami" eigentlich "umschlingen" bezeichnet und nicht beugen heißt. Weitere Varianten - wie z.B. aus eigener Rückenlage Ukes gebeugten Arm auf dessen Rücken hebeln - sind in der Prüfung auch zulässig. Die beiden Hebelprinzipien (Armbeuge-/Armstreckhebel) sollen korrekt und ruhig demonstriert werden. Dabei geht es weniger um das Anwenden in der richtigen Situation, als um die verantwortungsbewusste und wirksame Ausführung der Technik.
diff --git a/DieJudoGürtelprüfung/markdown/5terKyu/03-NeWaza-Grundform/meta.yaml b/DieJudoGürtelprüfung/markdown/5terKyu/03-NeWaza-Grundform/meta.yaml
new file mode 100644
index 0000000..9ba3ebb
--- /dev/null
+++ b/DieJudoGürtelprüfung/markdown/5terKyu/03-NeWaza-Grundform/meta.yaml
@@ -0,0 +1,3 @@
+---
+title: "Grundform der Bodentechniken"
+---
diff --git a/DieJudoGürtelprüfung/markdown/5terKyu/04-TachiWaza-Anwendung/01-KonterEindreh.md b/DieJudoGürtelprüfung/markdown/5terKyu/04-TachiWaza-Anwendung/01-KonterEindreh.md
new file mode 100644
index 0000000..823f56a
--- /dev/null
+++ b/DieJudoGürtelprüfung/markdown/5terKyu/04-TachiWaza-Anwendung/01-KonterEindreh.md
@@ -0,0 +1,18 @@
+---
+title: "Tori kontert eine Eindrehtechnik von Uke, nachdem dieser ausgewichen oder übergestiegen ist"
+video:
+    url: "videos/5terKyu/TachiWaza/KonterEindreh.webm"
+    width: 854
+    height: 480
+---
+## Stichpunkte
+
+- weit über das blockierende Bein steigen
+- zu Uke drehen
+- Bauch-Bauch-Kontakt
+- mit Ko-soto kontern
+- kontrolliertes Werfen und uke sichern
+
+## Anmerkungen
+
+Hier wird beispielhaft ein Tai-otoshi-Angriff mit Ko-soto-gari gekontert. Es sind natürlich auch andere Konter mit allen bereits gelernten Eindrehtechniken möglich. Man sollte aber auf realistische Möglichkeiten zurückgreifen.
diff --git a/DieJudoGürtelprüfung/markdown/5terKyu/04-TachiWaza-Anwendung/02-KonterFuss.md b/DieJudoGürtelprüfung/markdown/5terKyu/04-TachiWaza-Anwendung/02-KonterFuss.md
new file mode 100644
index 0000000..e3fdbd4
--- /dev/null
+++ b/DieJudoGürtelprüfung/markdown/5terKyu/04-TachiWaza-Anwendung/02-KonterFuss.md
@@ -0,0 +1,17 @@
+---
+title: "Oder Tori kontert eine Fußtechnik von Uke, nachdem dieser ausgewischen oder übergestiegen ist."
+video:
+    url: "videos/5terKyu/TachiWaza/KonterFuss.webm"
+    width: 854
+    height: 480
+---
+## Stichpunkte
+
+- dem O-uchi-gari weit nach hinten ausweichen
+- das angreifende Bein von Uke mit Ko-uchi-gari weitersicheln
+- Fußsohlen-Fersen-Kontakt
+- kontrolliertes Werfen und Uke sichern
+
+## Anmerkungen
+
+Hier wird beispielhaft ein O-uch-gari-Angriff mit Ko-uchi-gari gekontert. Es sind natürlich auch andere Konter mit allen bereits geernten Fußtechniken möglich. Man sollte aber auch hier auf realistische Möglichkeiten zurückgreifen.
diff --git a/DieJudoGürtelprüfung/markdown/5terKyu/04-TachiWaza-Anwendung/03-KombiEindreh.md b/DieJudoGürtelprüfung/markdown/5terKyu/04-TachiWaza-Anwendung/03-KombiEindreh.md
new file mode 100644
index 0000000..318e9d0
--- /dev/null
+++ b/DieJudoGürtelprüfung/markdown/5terKyu/04-TachiWaza-Anwendung/03-KombiEindreh.md
@@ -0,0 +1,19 @@
+---
+title: "Tori kombiniert eine Eindrehtechnik mit einer weiteren Wurftechnik nach Ukes Ausweichen oder Übersteigen"
+video:
+    url: "videos/5terKyu/TachiWaza/KombiEindreh.webm"
+    width: 854
+    height: 480
+---
+## Stichpunkte
+
+zum Beipiel:
+
+- ernsthaft mit Tai-otoshi angreifen
+- Uke steigt gezwungenermaßen über
+- Tori wirft Ko-uchi-gari
+- kontrolliertes werfen
+
+## Anmerkungen
+
+Hier wird beispielhaft ein Tai-otoshi Angriff mit Ko-uchi-gari kombiniert. Es sind natürlich auch andere Kombinationen mit allen berets gelernten Eindrehtechniken möglich. Man sollte aber wiederum auf realistische Möglichkeiten zurückgreifen.
diff --git a/DieJudoGürtelprüfung/markdown/5terKyu/04-TachiWaza-Anwendung/04-KombiFuss.md b/DieJudoGürtelprüfung/markdown/5terKyu/04-TachiWaza-Anwendung/04-KombiFuss.md
new file mode 100644
index 0000000..b7d57f9
--- /dev/null
+++ b/DieJudoGürtelprüfung/markdown/5terKyu/04-TachiWaza-Anwendung/04-KombiFuss.md
@@ -0,0 +1,19 @@
+---
+title: "Oder Tori kombiniert eine Fußtechnik mit einer weiteren Wurftechnik nach Ukes Ausweichen oder Übersteigen"
+video:
+    url: "videos/5terKyu/TachiWaza/KombiFuss.webm"
+    width: 854
+    height: 480
+---
+## Stichpunkte
+
+zum Beispiel:
+
+- ernsthaft mit Ko-uchi-gari angreifen
+- Uke weicht aus oder steigt über
+- Tori wirft O-uchi-gari
+- kontrolliertes Werfen und Uke sichern
+
+## Anmerkungen
+
+In diesen Anwendungsaufgaben geht es um die verschiedenen Möglichkeiten, Ausweichen oder Übersteigen nach einem ersten Wurfversuch zu einem zweiten Wurf zu nutzen. Uke kann seinen Reaktion zu einem Konter nutzen und Tori kann Ukes Reaktion auf den ersten Wurf mit einem nachfolgendem zweiten Wurf kombinieren. Dies kann auf dieser Ausbildungsstufe nur bei einem angemessenen Partnerverhalten erfolgen.
diff --git a/DieJudoGürtelprüfung/markdown/5terKyu/04-TachiWaza-Anwendung/meta.yaml b/DieJudoGürtelprüfung/markdown/5terKyu/04-TachiWaza-Anwendung/meta.yaml
new file mode 100644
index 0000000..6426bf2
--- /dev/null
+++ b/DieJudoGürtelprüfung/markdown/5terKyu/04-TachiWaza-Anwendung/meta.yaml
@@ -0,0 +1,3 @@
+---
+title: "Anwendungsaufgabe Stand"
+---
diff --git a/DieJudoGürtelprüfung/markdown/5terKyu/05-NeWaza-Anwendung/01-UkesBefreiungZuJujiGatame.md b/DieJudoGürtelprüfung/markdown/5terKyu/05-NeWaza-Anwendung/01-UkesBefreiungZuJujiGatame.md
new file mode 100644
index 0000000..8fa6e25
--- /dev/null
+++ b/DieJudoGürtelprüfung/markdown/5terKyu/05-NeWaza-Anwendung/01-UkesBefreiungZuJujiGatame.md
@@ -0,0 +1,13 @@
+---
+title: "Ukes Befreiungsversuch aus einem Haltegriff zu Juji-gatame nutzen"
+video:
+    url: "videos/5terKyu/NeWaza/UkesBefreiungZuJujiGatame.webm"
+    width: 854
+    height: 480
+---
+## Stichpunkte
+
+- Uke versucht, sich aus Tate-shio-gatame herauszudrehen
+- Tori fängt den Arm in der Ellenbeuge ab,...
+- ...steigt über den Kopf...
+- ...und hebelt kontrolliert mit Juji-gatame
diff --git a/DieJudoGürtelprüfung/markdown/5terKyu/05-NeWaza-Anwendung/02-UkesBefreiungZuUdeGarami.md b/DieJudoGürtelprüfung/markdown/5terKyu/05-NeWaza-Anwendung/02-UkesBefreiungZuUdeGarami.md
new file mode 100644
index 0000000..bf9eab7
--- /dev/null
+++ b/DieJudoGürtelprüfung/markdown/5terKyu/05-NeWaza-Anwendung/02-UkesBefreiungZuUdeGarami.md
@@ -0,0 +1,17 @@
+---
+title: "Oder Ukes Befreiungsversuch aus einem Haltegriff zu Ude-garami nutzen"
+video:
+    url: "videos/5terKyu/NeWaza/UkesBefreiungZuUdeGarami.webm"
+    width: 854
+    height: 480
+---
+## Stichpunkte
+
+- Uke versucht sich aus Kuzure-kesa-gatame herauszudrehen
+- Tori fängt den Arm am Handgelenk ab,...
+- ...dreht sich zum Partner...
+- ...und hebelt kontrolliert mit Ude-garami
+
+## Anmerkungen
+
+Hier sollen die erlernten Armhebel in Standardsituationen sinnvoll angewendet werden, vor allem, wenn Uke sich aus Haltegriffen zu befreien versucht.
diff --git a/DieJudoGürtelprüfung/markdown/5terKyu/05-NeWaza-Anwendung/03-BefreiungDurchBeinklammer.md b/DieJudoGürtelprüfung/markdown/5terKyu/05-NeWaza-Anwendung/03-BefreiungDurchBeinklammer.md
new file mode 100644
index 0000000..68294ad
--- /dev/null
+++ b/DieJudoGürtelprüfung/markdown/5terKyu/05-NeWaza-Anwendung/03-BefreiungDurchBeinklammer.md
@@ -0,0 +1,17 @@
+---
+title: "Einsatz der Beinklammer zur Verteidigung in der eigenen Rückenlage"
+video:
+    url: "videos/5terKyu/NeWaza/BefreiungDurchBeinklammer.webm"
+    width: 854
+    height: 480
+---
+## Stichpunkte
+
+- aus Yoko-shio-gatame zum Partner hindrehen
+- mit dem oberen Bein ukes Bein einfangen
+- mit dem anderen Bein unten durch
+- Beinklammer schließen
+
+## Anmerkungen
+
+Die beinklammer ist häufig die einfachste Möglichkeit, sich aus einem Haltegriff zu befreien. Aber auch in brenzligen Situationen - besonders in eigener Rückenlage - ist die Beinklammer eine gute Verteidigung um erst gar nicht in einen Haltegriff zu geraten.
diff --git a/DieJudoGürtelprüfung/markdown/5terKyu/05-NeWaza-Anwendung/04-BefreiungAusBeinklammer.md b/DieJudoGürtelprüfung/markdown/5terKyu/05-NeWaza-Anwendung/04-BefreiungAusBeinklammer.md
new file mode 100644
index 0000000..b2542fb
--- /dev/null
+++ b/DieJudoGürtelprüfung/markdown/5terKyu/05-NeWaza-Anwendung/04-BefreiungAusBeinklammer.md
@@ -0,0 +1,18 @@
+---
+title: "Eine Befreiung aus der Beinklammer"
+video:
+    url: "videos/5terKyu/NeWaza/BefreiungAusBeinklammer.webm"
+    width: 854
+    height: 480
+---
+## Stichpunkte
+
+- Oberkörper von Uke fixieren
+- Knie heraus
+- Hüftwechsel
+- Fuß mithilfe des anderen Fußes befreien
+- festhalten
+
+## Anmerkungen
+
+Die oben genannten Schritte gelten für fast alle Befreiungen aus der Beinklammer und sind als grundsätzliche Prinzipien anzusehen. Mit der Standardsituation Beinklammer sollen die situativen Möglichkeiten erweitert werden, aus der Oberlage oder Unterlage zum Erfolg zu kommen.
diff --git a/DieJudoGürtelprüfung/markdown/5terKyu/05-NeWaza-Anwendung/05-JujiGgBank.md b/DieJudoGürtelprüfung/markdown/5terKyu/05-NeWaza-Anwendung/05-JujiGgBank.md
new file mode 100644
index 0000000..ca062ce
--- /dev/null
+++ b/DieJudoGürtelprüfung/markdown/5terKyu/05-NeWaza-Anwendung/05-JujiGgBank.md
@@ -0,0 +1,21 @@
+---
+title: "Einen Angriff gegen die Bankposition mit Juji-gatame beenden"
+video:
+    url: "videos/5terKyu/NeWaza/JujiGgBank.webm"
+    width: 854
+    height: 480
+---
+## Stichpunkte
+
+- von oben einsteigen in die mittlere Bank
+- Arm einhaken
+  - Uke muss Gegenspannung halten
+- Bein durchschieben und mit Fuß sichern
+- Knie vor Ukes Kopf setzenn
+- Uke auf den Rücken drehen
+- kontrolliert heranrücken
+- mit Juji-gatame hebeln
+
+## Anmerkungen
+
+Der hier gezeigte gerollte Juji-gatame ist eine der erfolgreichsten Bodentechniken der letzten Jahrzehnte und gehört zum Repertoire eines jeden guten Bodenkämpfers. Selbstverständlich sind alle bekannten Varianten gegen die Bankposition auch zur Prüfung zulässig.
diff --git a/DieJudoGürtelprüfung/markdown/5terKyu/05-NeWaza-Anwendung/meta.yaml b/DieJudoGürtelprüfung/markdown/5terKyu/05-NeWaza-Anwendung/meta.yaml
new file mode 100644
index 0000000..7134aa2
--- /dev/null
+++ b/DieJudoGürtelprüfung/markdown/5terKyu/05-NeWaza-Anwendung/meta.yaml
@@ -0,0 +1,3 @@
+---
+title: "Anwendungsaufgabe Boden"
+---
diff --git a/DieJudoGürtelprüfung/markdown/5terKyu/06-Randori/01-Randori.md b/DieJudoGürtelprüfung/markdown/5terKyu/06-Randori/01-Randori.md
new file mode 100644
index 0000000..1ac7d1f
--- /dev/null
+++ b/DieJudoGürtelprüfung/markdown/5terKyu/06-Randori/01-Randori.md
@@ -0,0 +1,16 @@
+---
+title: "Im Stand-Randori Wurftechniken auch bei gegengleichem Griff werfen, ohne den Griff zu lösen und im Boden-Randori in der Ausgangssituation \"Beinklammer\" beginnen"
+video:
+    url: "videos/5terKyu/Randori/Randori.webm"
+    width: 854
+    height: 480
+---
+
+Die Gesamtzeit für das Prüfngsfach Randori sollte auch bei mehreren Partnerwechseln 10 Minuten nicht überschreiten. Die beim Randori übenden Judoka sollen:
+
+- **nicht** den Griff wechseln, **sondern** auf Verlangen der Prüfer mit gleichem oder gegengleichem Griff kämpfen
+- **nicht** ausschließlich verteidigen, **sondern** auch Fehler im Angriffsverhalten des Partners zu eigenen Kontertechniken nutzen
+- **nicht** mit "steifen", festen Armen sperren, **sondern** eine bewegliche, lockere Verteidigung vor allem durch Ausweichen und übersteigen demonstrieren
+- sich **nicht** schablonenhaft, genormt, gelernt oder abgesprochen bewegen, **sondern** die sich ergebenden Chancen leicht zu kontrollierten Würfen nutzen
+- am Boden **nicht** einfach die erlernten Griffe demonstrieren, **sondern** diese als Lösungen für Standardsituationen deutlich machen
+- nicht so verteidigen, dass der partner keine Technik mehr ausführen kann, sondern mit dem dosierten Widerstand, der unter Anstrengung eine Technik noch möglich macht
diff --git a/DieJudoGürtelprüfung/markdown/5terKyu/06-Randori/meta.yaml b/DieJudoGürtelprüfung/markdown/5terKyu/06-Randori/meta.yaml
new file mode 100644
index 0000000..8b0ed9a
--- /dev/null
+++ b/DieJudoGürtelprüfung/markdown/5terKyu/06-Randori/meta.yaml
@@ -0,0 +1,3 @@
+---
+title: "Randori"
+---
diff --git a/DieJudoGürtelprüfung/markdown/5terKyu/07-Lexikon/01-Lexikon.md b/DieJudoGürtelprüfung/markdown/5terKyu/07-Lexikon/01-Lexikon.md
new file mode 100644
index 0000000..8c9429a
--- /dev/null
+++ b/DieJudoGürtelprüfung/markdown/5terKyu/07-Lexikon/01-Lexikon.md
@@ -0,0 +1,17 @@
+---
+title: "Lexikon/neue japanische Begriffe"
+---
+Die Prüflinge sollten vor allem die Begriffe kennen, die zum Bestehen der Prüfung notwendig sind, z.B. die Namen der geforderten Judotechniken.
+
+|  Nr. |             Japanisch | Deutsch                                                |
+| ---: | --------------------: | :----------------------------------------------------- |
+|   27 |           Kenka-yotsu | gegengleicher Griff (rechts gegen links und umgekehrt) |
+|   28 |              Tsuri-te | Hubarm, Führhand                                       |
+|   29 |               Hiki-te | Zughand                                                |
+|   30 |             Kumi-kata | Form/Art des Greifens                                  |
+|   31 |      Morote-seoi-nage | Schulterwurf mit beiden Händen                         |
+|   32 | Sasae-tsuri-komi-ashi | Fußstoppwurf/Hebezugfußhalten                          |
+|   33 |           Hiza-guruma | Knierad                                                |
+|   34 |      Okuri-ashi-barai | Fußnachfegen, beide Füße fegen                         |
+|   35 |           O-soto-gari | große Außensichel                                      |
+|   36 |           Harai-goshi | Hüftfeger                                              |
diff --git a/DieJudoGürtelprüfung/markdown/5terKyu/07-Lexikon/meta.yaml b/DieJudoGürtelprüfung/markdown/5terKyu/07-Lexikon/meta.yaml
new file mode 100644
index 0000000..2e023cb
--- /dev/null
+++ b/DieJudoGürtelprüfung/markdown/5terKyu/07-Lexikon/meta.yaml
@@ -0,0 +1,3 @@
+---
+title: "Lexikon"
+---
\ No newline at end of file
diff --git a/DieJudoGürtelprüfung/markdown/5terKyu/meta.yaml b/DieJudoGürtelprüfung/markdown/5terKyu/meta.yaml
new file mode 100644
index 0000000..0e05857
--- /dev/null
+++ b/DieJudoGürtelprüfung/markdown/5terKyu/meta.yaml
@@ -0,0 +1,3 @@
+---
+title: "5. Kyu - oranger Gürtel"
+---
\ No newline at end of file
diff --git a/DieJudoGürtelprüfung/markdown/6terKyu/01-Ukemi/01-Ushiro.md b/DieJudoGürtelprüfung/markdown/6terKyu/01-Ukemi/01-Ushiro.md
new file mode 100644
index 0000000..f4ee297
--- /dev/null
+++ b/DieJudoGürtelprüfung/markdown/6terKyu/01-Ukemi/01-Ushiro.md
@@ -0,0 +1,8 @@
+---
+title: Fallen rückwärts
+video:
+    url: "videos/8terKyu/Ukemi/Ushiro.webm"
+    width: 854
+    height: 480 
+---
+Fallen rückwärts wurde bereits in den vorigen Kyu-Stufen intensiv geübt und wird jetzt beherscht.
diff --git a/DieJudoGürtelprüfung/markdown/6terKyu/01-Ukemi/02-Yoko.md b/DieJudoGürtelprüfung/markdown/6terKyu/01-Ukemi/02-Yoko.md
new file mode 100644
index 0000000..407fce3
--- /dev/null
+++ b/DieJudoGürtelprüfung/markdown/6terKyu/01-Ukemi/02-Yoko.md
@@ -0,0 +1,8 @@
+---
+title: Fallen seitwärts zu beiden Seiten
+video:
+    url: "videos/8terKyu/Ukemi/Yoko.webm"
+    width: 854
+    height: 480
+---
+Fallen seitwärts zu beiden Seiten wurde bereits in den vorigen Kyu-Stufen intensiv geübt und wird jetzt beherscht.
diff --git a/DieJudoGürtelprüfung/markdown/6terKyu/01-Ukemi/03-MaeMawari.md b/DieJudoGürtelprüfung/markdown/6terKyu/01-Ukemi/03-MaeMawari.md
new file mode 100644
index 0000000..8860b5d
--- /dev/null
+++ b/DieJudoGürtelprüfung/markdown/6terKyu/01-Ukemi/03-MaeMawari.md
@@ -0,0 +1,19 @@
+---
+title: Judorolle vorwärts beidseitig mit Liegenbleiben oder Aufstehen
+video:
+    url: "videos/8terKyu/Ukemi/MaeMawari.webm"
+    width: 854
+    height: 480
+---
+## Stichpunkte
+
+- über beide Arme stützen
+- rund rollen
+- am Ende jeweils
+  - in der Endposition liegen bleiben,...
+  - oder weiter rollen und aufstehen
+- wird auf beiden Seiten geprüft
+
+## Anmerkungen
+
+Fallen rückwärts und seitwärts zu beiden Seiten wurde bereits in der vorherigen Kyu-Stufe intesiv geübt und wird jetzt beherrscht. Auf dieser Stufe muss die Judorolle zu beiden Seiten gezeigt werden. Entweder mit Liegenbleiben oder mit Aufstehen. Die Judorolle wird von Stufe zu Stufe sicherer. Dies ist vor allem jetzt für das Erlernen des Tai-otoshi und später für weitere Techniken eine sehr nützliche Vorraussetzung. Außerdem kann es Dich im Alltag vor Verletzungen schützen.
diff --git a/DieJudoGürtelprüfung/markdown/6terKyu/01-Ukemi/meta.yaml b/DieJudoGürtelprüfung/markdown/6terKyu/01-Ukemi/meta.yaml
new file mode 100644
index 0000000..f2bd558
--- /dev/null
+++ b/DieJudoGürtelprüfung/markdown/6terKyu/01-Ukemi/meta.yaml
@@ -0,0 +1,3 @@
+---
+title: "Falltechniken"
+---
\ No newline at end of file
diff --git a/DieJudoGürtelprüfung/markdown/6terKyu/02-NageWaza-Grundform/01-Ippon-Seoi-nage.md b/DieJudoGürtelprüfung/markdown/6terKyu/02-NageWaza-Grundform/01-Ippon-Seoi-nage.md
new file mode 100644
index 0000000..e98db53
--- /dev/null
+++ b/DieJudoGürtelprüfung/markdown/6terKyu/02-NageWaza-Grundform/01-Ippon-Seoi-nage.md
@@ -0,0 +1,18 @@
+---
+title: "Ippon-seoi-nage"
+video:
+    url: "videos/6terKyu/NageWaza/IpponSeoiNage.webm"
+    width: 854
+    height: 480
+---
+## Stichpunkte
+
+- sicherer, schulterbreiter Stand
+- Rücken-Bauch-Kontakt
+- kontrolliertes Werfen durch Ausheben über die Schulter
+- Uke sichern
+- soll zu beiden Seiten geübt werden - geprüft wird nur eine Seite
+
+## Anmerkungen
+
+Ippon-seoi -nage sollte aus dem Reversgriff erlernt werden, denn dadurch kann der Oberkörperkontakt leichter hergestellt werden und Uke wird besser kontrolliert. Tori soll mit leicht gebeugten Beinen und möglicht geradem Rücken Kontakt herstellen und durch Strecken der Beine und leicht Rotation im Oberkörper werfen. In dieser Stufe sollte eine Technik zur anderen Seite gezeigt werden - wir empfehlen Ippon-seoi-nage.
diff --git a/DieJudoGürtelprüfung/markdown/6terKyu/02-NageWaza-Grundform/02-TaiOtoshi.md b/DieJudoGürtelprüfung/markdown/6terKyu/02-NageWaza-Grundform/02-TaiOtoshi.md
new file mode 100644
index 0000000..4dacda9
--- /dev/null
+++ b/DieJudoGürtelprüfung/markdown/6terKyu/02-NageWaza-Grundform/02-TaiOtoshi.md
@@ -0,0 +1,18 @@
+---
+title: "Tai-otoshi"
+video:
+    url: "videos/6terKyu/NageWaza/TaiOtoshi.webm"
+    width: 854
+    height: 480
+---
+## Stichpunkte
+
+- sicherer, breiter Stand auf beiden Beinen
+- Ärmel-Revers-Griff
+- Seite-Bauch-Kontakt
+- kontrolliertes Werfen über das blockierende Bein
+- Uke sichern
+
+## Anmerkungen
+
+Hub- und Zugarm sollen beim Gleichgewichtsbruch aus dem Ärmel-Revers-Griff gleichzeitig arbeiten. Bei Tai-otoshi rechts ist es wichtig, dass Tori beide Beine gleich belastet und das belastete, rechte Bein von Uke blockiert.
diff --git a/DieJudoGürtelprüfung/markdown/6terKyu/02-NageWaza-Grundform/03-KoUchiGari.md b/DieJudoGürtelprüfung/markdown/6terKyu/02-NageWaza-Grundform/03-KoUchiGari.md
new file mode 100644
index 0000000..8b3fcff
--- /dev/null
+++ b/DieJudoGürtelprüfung/markdown/6terKyu/02-NageWaza-Grundform/03-KoUchiGari.md
@@ -0,0 +1,17 @@
+---
+title: "Ko-soto-gake oder Ko-soto-gari"
+video:
+    url: "videos/6terKyu/NageWaza/KoSotoGakeKoSotoGari.webm"
+    width: 854
+    height: 480
+---
+## Stichpunkte
+
+- aus gleicher Ausgangslage und engem Griff
+- Bauch-Bauch-Kontakt
+- Einhängen *oder* Wegsicheln
+- Uke sichern ohne mitzufallen
+
+## Anmerkungen
+
+Ko-soto-gake/gari kann mit der Ferse eingehangen oder auch mit dem Unterschenkel wegziehend geworfen werden. Die Unterschiede sind fließend und die Prinzipien können sich mischen.
diff --git a/DieJudoGürtelprüfung/markdown/6terKyu/02-NageWaza-Grundform/04-DeAshiBarei.md b/DieJudoGürtelprüfung/markdown/6terKyu/02-NageWaza-Grundform/04-DeAshiBarei.md
new file mode 100644
index 0000000..fbbd794
--- /dev/null
+++ b/DieJudoGürtelprüfung/markdown/6terKyu/02-NageWaza-Grundform/04-DeAshiBarei.md
@@ -0,0 +1,16 @@
+---
+title: "De-ashi-barei"
+video:
+    url: "videos/6terKyu/NageWaza/DeAshiBarei.webm"
+    width: 854
+    height: 480
+---
+## Stichpunkte
+
+- das sich bewegende Bein in Bewegungsrichtung weiterführen
+- Fußsohle-Knöchel-Kontakt
+- Uke sichern
+
+## Anmerkungen
+
+Mit De-ashi-barei kommt die erste Fegetechnik erst jetzt hinzu. Dieses neue Wurfprinzip soll behutsam eingeführt werden.
diff --git a/DieJudoGürtelprüfung/markdown/6terKyu/02-NageWaza-Grundform/meta.yaml b/DieJudoGürtelprüfung/markdown/6terKyu/02-NageWaza-Grundform/meta.yaml
new file mode 100644
index 0000000..87c601a
--- /dev/null
+++ b/DieJudoGürtelprüfung/markdown/6terKyu/02-NageWaza-Grundform/meta.yaml
@@ -0,0 +1,3 @@
+---
+title: "Grundform der Wurftechnik"
+---
diff --git a/DieJudoGürtelprüfung/markdown/6terKyu/03-NeWaza-Grundform/01-KesaGatame.md b/DieJudoGürtelprüfung/markdown/6terKyu/03-NeWaza-Grundform/01-KesaGatame.md
new file mode 100644
index 0000000..e51f9c7
--- /dev/null
+++ b/DieJudoGürtelprüfung/markdown/6terKyu/03-NeWaza-Grundform/01-KesaGatame.md
@@ -0,0 +1,19 @@
+---
+title: "Kesa-gatame mit Variationen"
+video:
+    url: "videos/6terKyu/NeWaza/KesaGatame.webm"
+    width: 854
+    height: 480
+---
+## Stichpunkte
+
+- viele Varianten im Boden ausprobieren:
+  - um den Kopf greifen
+  - unter dem Kopf stützen
+  - umgekehrt halten
+  - ...
+- auf Ukes Befreiungsversuche mit Varianten reagieren
+
+## Anmerkungen
+
+Mit der Einführung von Haltegriffvarianten soll das Verständnis für eine variable Arbeit am Boden gestärkt werden.
diff --git a/DieJudoGürtelprüfung/markdown/6terKyu/03-NeWaza-Grundform/02-YokoShioGatame.md b/DieJudoGürtelprüfung/markdown/6terKyu/03-NeWaza-Grundform/02-YokoShioGatame.md
new file mode 100644
index 0000000..7f8287d
--- /dev/null
+++ b/DieJudoGürtelprüfung/markdown/6terKyu/03-NeWaza-Grundform/02-YokoShioGatame.md
@@ -0,0 +1,19 @@
+---
+title: "Yoko-shio-gatame mit Variationen"
+video:
+    url: "videos/6terKyu/NeWaza/YokoShioGatame.webm"
+    width: 854
+    height: 480
+---
+## Stichpunkte
+
+- viele Variationen ausprobieren:
+  - am Gürtel halten
+  - den Arm festhalten
+  - Beine mal gestreckt, mal gebeugt
+  - ...
+- auf Ukes Befreiungsversuche mit Varianten reagieren
+
+## Anmerkungen
+
+Die Judoka sollen verstehen, dass man den gleichen Haltegriff mit unterschiedlichem Einsatz der Arme, Beine und des Körpergewichtes ausführen kann, um so Ukes Verteidigungs-/Befreiungsversuchen zu begegnen.
diff --git a/DieJudoGürtelprüfung/markdown/6terKyu/03-NeWaza-Grundform/03-TateShioGatame.md b/DieJudoGürtelprüfung/markdown/6terKyu/03-NeWaza-Grundform/03-TateShioGatame.md
new file mode 100644
index 0000000..d2e50b5
--- /dev/null
+++ b/DieJudoGürtelprüfung/markdown/6terKyu/03-NeWaza-Grundform/03-TateShioGatame.md
@@ -0,0 +1,19 @@
+---
+title: "Tate-shio-gatame mit Variationen"
+video:
+    url: "videos/6terKyu/NeWaza/TateShioGatame.webm"
+    width: 854
+    height: 480
+---
+## Stichpunkte
+
+- viele Variationen ausprobieren:
+  - Griff um den Kopf
+  - Einklemmen von Ukes Arm
+  - Füße einhaken oder nicht
+  - ...
+- auf Ukes Befreiungsversuche mit Varianten reagieren
+
+## Anmerkungen
+
+Durch offene Aufgabenstellungen und Ausprobieren können auch eigene Varianten gefunden werden
diff --git a/DieJudoGürtelprüfung/markdown/6terKyu/03-NeWaza-Grundform/04-KamiShioGatame.md b/DieJudoGürtelprüfung/markdown/6terKyu/03-NeWaza-Grundform/04-KamiShioGatame.md
new file mode 100644
index 0000000..603a22e
--- /dev/null
+++ b/DieJudoGürtelprüfung/markdown/6terKyu/03-NeWaza-Grundform/04-KamiShioGatame.md
@@ -0,0 +1,19 @@
+---
+title: "Tate-shio-gatame mit Variationen"
+video:
+    url: "videos/6terKyu/NeWaza/TateShioGatame.webm"
+    width: 854
+    height: 480
+---
+## Stichpunkte
+
+- viele Variationen ausprobieren:
+  - von rechts oder links schräg hinten
+  - über oder unter die Arme greifen
+  - Beine gebeugt oder gestreckt
+  - ...
+- auf Ukes Befreiungsversuche mit Varianten reagieren
+
+## Anmerkungen
+
+Zwei der oben genannten Haltegrigffe sollen in zwei verschiendenen Varianten gezeigt werden. Wir empfehlen Kesa- und Yoko-shio-gatame.
\ No newline at end of file
diff --git a/DieJudoGürtelprüfung/markdown/6terKyu/03-NeWaza-Grundform/meta.yaml b/DieJudoGürtelprüfung/markdown/6terKyu/03-NeWaza-Grundform/meta.yaml
new file mode 100644
index 0000000..9ba3ebb
--- /dev/null
+++ b/DieJudoGürtelprüfung/markdown/6terKyu/03-NeWaza-Grundform/meta.yaml
@@ -0,0 +1,3 @@
+---
+title: "Grundform der Bodentechniken"
+---
diff --git a/DieJudoGürtelprüfung/markdown/6terKyu/04-TachiWaza-Anwendung/01-IpponSeoiNage.md b/DieJudoGürtelprüfung/markdown/6terKyu/04-TachiWaza-Anwendung/01-IpponSeoiNage.md
new file mode 100644
index 0000000..b3ec898
--- /dev/null
+++ b/DieJudoGürtelprüfung/markdown/6terKyu/04-TachiWaza-Anwendung/01-IpponSeoiNage.md
@@ -0,0 +1,20 @@
+---
+title: "Wenn Uke zieht und/oder zurückgeht, wirft Tori mit Ippon-seoi-nage"
+video:
+    url: "videos/6terKyu/AnwendungTachiWaza/IpponSeoiNage.webm"
+    width: 854
+    height: 480
+---
+## Stichpunkte
+
+- starker Zug am Revers
+- rückwärts eindrehen
+- sicherer, schulterbreiter Stand
+- Rücken-Bauch-Kontakt
+- Ukes Oberarm fest einklemmen
+- Kontrolliertes Werfen durch Ausheben
+- Uke sichern
+
+## Anmerkungen
+
+Auf dieser Stufe lernt Tori, einen Wurf durch eigene Aktionen vorzubereiten ("Situationen schaffen"). Dabei werden Körperbewegung ("Tai-sabaki") und der wechselnde Einsatz von Zug und Druck mit den Armen sehr wichtig.
diff --git a/DieJudoGürtelprüfung/markdown/6terKyu/04-TachiWaza-Anwendung/02-TaiOtoshi.md b/DieJudoGürtelprüfung/markdown/6terKyu/04-TachiWaza-Anwendung/02-TaiOtoshi.md
new file mode 100644
index 0000000..afb9965
--- /dev/null
+++ b/DieJudoGürtelprüfung/markdown/6terKyu/04-TachiWaza-Anwendung/02-TaiOtoshi.md
@@ -0,0 +1,20 @@
+---
+title: "Wenn Tori zieht und/oder zurückgeht, wirft Tori mit Tai-otoshi"
+video:
+    url: "videos/6terKyu/AnwendungTachiWaza/TaiOtoshi.webm"
+    width: 854
+    height: 480
+---
+## Stichpunkte
+
+- starker Zug mit Ärmel-Revers-Griff
+- Seitwärts eindrehen
+- sicherer, gegrätschter Stand
+- beidbeinige Belastung
+- Seite-Bauch-Kontakt
+- kontrolliertes Werfen über das blockierende Bein
+- Uke sichern
+
+## Anmerkungen
+
+Tai-otoshi soll aus gleicher Auslage mit Ärmel-Revers-Griff durch starken Zug und kräftige Rotation im Oberkörper über das belastete, blockierende Bein geworfen werden.
diff --git a/DieJudoGürtelprüfung/markdown/6terKyu/04-TachiWaza-Anwendung/03-KoUchiGari.md b/DieJudoGürtelprüfung/markdown/6terKyu/04-TachiWaza-Anwendung/03-KoUchiGari.md
new file mode 100644
index 0000000..bd92cf7
--- /dev/null
+++ b/DieJudoGürtelprüfung/markdown/6terKyu/04-TachiWaza-Anwendung/03-KoUchiGari.md
@@ -0,0 +1,18 @@
+---
+title: "Wenn Uke zieht und/oder zurückgeht, wirft Tori mit Ko-uch-gari"
+video:
+    url: "videos/6terKyu/AnwendungTachiWaza/KoUchiGari.webm"
+    width: 854
+    height: 480
+---
+## Stichpunkte
+
+- Ärmel-Revers-Griff
+- gleiche Auslage
+- provoziere Ukes Gegenzug durch eigenen Zug
+- Fußsohle-Ferse-Kontakt
+- Kontrolliertes Werfen ohne Mitfallen
+
+## Anmerkungen
+
+Uke muss sich bei dieser Anwendungsaufgabe der Technik entsprechend die unterschiedlichen Arten zeigen, wie man auf einen Zug nach vorne reagieren kann.
diff --git a/DieJudoGürtelprüfung/markdown/6terKyu/04-TachiWaza-Anwendung/04-DeAshiBarei.md b/DieJudoGürtelprüfung/markdown/6terKyu/04-TachiWaza-Anwendung/04-DeAshiBarei.md
new file mode 100644
index 0000000..097e90b
--- /dev/null
+++ b/DieJudoGürtelprüfung/markdown/6terKyu/04-TachiWaza-Anwendung/04-DeAshiBarei.md
@@ -0,0 +1,19 @@
+---
+title: "Wenn Uke zieht und/oder zurückgeht, wirft Tori mit De-ashi-barei"
+video:
+    url: "videos/6terKyu/AnwendungTachiWaza/DeAshiBarei.webm"
+    width: 854
+    height: 480
+---
+## Stichpunkte
+
+- Ärmel-Revers-Griff
+- gleiche Auslage
+- Seitwärtsbewegung
+- Fußsohle-Ferse-Kontakt
+- Kontrolliertes Werfen durch Weiterfegen des sich bewegenden Beines
+- Uke sichern
+
+## Anwendung
+
+Probiere den De-ashi-barei in vielen unterschiedlichen Bewegungen aus und finde heraus, wann der günstigste Zeitpunkt zur Fegetechnik da ist.
diff --git a/DieJudoGürtelprüfung/markdown/6terKyu/04-TachiWaza-Anwendung/05-Ausweichen.md b/DieJudoGürtelprüfung/markdown/6terKyu/04-TachiWaza-Anwendung/05-Ausweichen.md
new file mode 100644
index 0000000..29394b8
--- /dev/null
+++ b/DieJudoGürtelprüfung/markdown/6terKyu/04-TachiWaza-Anwendung/05-Ausweichen.md
@@ -0,0 +1,18 @@
+---
+title: "Wenn Uke mit Ippon-seoi-nage, Tai-otoshi oder De-ashi-barei angreift, weicht Tori aus oder steigt über"
+video:
+    url: "videos/6terKyu/AnwendungTachiWaza/Ausweichen.webm"
+    width: 854
+    height: 480
+---
+## Stichpunkte
+
+- lockerer Griff
+- verschiedene Angriffe
+- Ausweichen
+- Übersteigen
+- häufiger Rollentausch
+
+## Anmerkungen
+
+Parallel zur größeren Aktivität soll nicht nur Tori, sondern auch Uke lernen, sich korrekt und angemessen zu verteidigen. Dies soll zunächst sehr judogemäß durch Ausweichen und Übersteigen erfolgen. *Achtung*: Kein Sperren mit den Armen!
diff --git a/DieJudoGürtelprüfung/markdown/6terKyu/04-TachiWaza-Anwendung/meta.yaml b/DieJudoGürtelprüfung/markdown/6terKyu/04-TachiWaza-Anwendung/meta.yaml
new file mode 100644
index 0000000..6426bf2
--- /dev/null
+++ b/DieJudoGürtelprüfung/markdown/6terKyu/04-TachiWaza-Anwendung/meta.yaml
@@ -0,0 +1,3 @@
+---
+title: "Anwendungsaufgabe Stand"
+---
diff --git a/DieJudoGürtelprüfung/markdown/6terKyu/05-NeWaza-Anwendung/01-OUchiGari.md b/DieJudoGürtelprüfung/markdown/6terKyu/05-NeWaza-Anwendung/01-OUchiGari.md
new file mode 100644
index 0000000..92f0af6
--- /dev/null
+++ b/DieJudoGürtelprüfung/markdown/6terKyu/05-NeWaza-Anwendung/01-OUchiGari.md
@@ -0,0 +1,17 @@
+---
+title: "O-uchi-gari mit anschließendem Haltegriff"
+video:
+    url: "videos/6terKyu/AnwendungNeWaza/OUchiGari.webm"
+    width: 854
+    height: 480
+---
+## Stichpunkte
+
+- lockeres Werfen mit O-uchi-gari
+- mit dem Knie über Ukes Oberschenkel steigen
+- Griff beibehalten und Uke kontrollieren
+- zügiger Übergang zu einem Haltegriff
+
+## Anmerkungen
+
+Der flüssige Übergang vom Stand in die Bodenlage wird mit Fußtechniken eingeführt. Tori soll Uke dabei während der gesamten Bewegung kontrollieren und sinnvoll zu einem Haltegriff übergehen.
diff --git a/DieJudoGürtelprüfung/markdown/6terKyu/05-NeWaza-Anwendung/02-KoUchiGari.md b/DieJudoGürtelprüfung/markdown/6terKyu/05-NeWaza-Anwendung/02-KoUchiGari.md
new file mode 100644
index 0000000..d8c4c1c
--- /dev/null
+++ b/DieJudoGürtelprüfung/markdown/6terKyu/05-NeWaza-Anwendung/02-KoUchiGari.md
@@ -0,0 +1,18 @@
+---
+title: "Ko-uchi-gari mit anschließendem Haltegriff"
+video:
+    url: "videos/6terKyu/AnwendungNeWaza/KoUchiGari.webm"
+    width: 854
+    height: 480
+---
+## Stichpunkte
+
+- lockeres Werfen mit KO-uchi-gari
+- mit dem Knie über Ukes Oberschenkel steigen
+- Griff beibehalten und Uke kontrollieren
+- zügiger Übergang zu einem Haltegriff
+- z.B. Kesa-gatame
+
+## Anmerkungen
+
+Versuche, trotz des flüssigen Überganges deinen Partner zu schonen und unnötiges, schmerzhaftes Darauffallen zu vermeiden.
diff --git a/DieJudoGürtelprüfung/markdown/6terKyu/05-NeWaza-Anwendung/03-Befreiungsprinzipien.md b/DieJudoGürtelprüfung/markdown/6terKyu/05-NeWaza-Anwendung/03-Befreiungsprinzipien.md
new file mode 100644
index 0000000..c0b0f6b
--- /dev/null
+++ b/DieJudoGürtelprüfung/markdown/6terKyu/05-NeWaza-Anwendung/03-Befreiungsprinzipien.md
@@ -0,0 +1,19 @@
+---
+title: "Zwei unterschiedliche Befreiungsprinzipien aus einem der oben genannten Haltegriffe"
+video:
+    url: "videos/6terKyu/AnwendungNeWaza/Befreiungsprinzipien.webm"
+    width: 854
+    height: 480
+---
+## Stichpunkte
+
+- Befreien durch Wegschieben des Partners
+- Arm herausziehen
+- zum Partner hin auf den Bauch drehen
+- Befreien durch Beinklammer
+- oder andere, bereits geübte Prinzipien
+- ...
+
+## Anmerkungen
+
+Die Befreiungen sollten sich nach Möglichkeit ergänzen, d.h., die Reaktionen von Uke berücksichtigen.
diff --git a/DieJudoGürtelprüfung/markdown/6terKyu/05-NeWaza-Anwendung/04-AngriffOberlage.md b/DieJudoGürtelprüfung/markdown/6terKyu/05-NeWaza-Anwendung/04-AngriffOberlage.md
new file mode 100644
index 0000000..99d0341
--- /dev/null
+++ b/DieJudoGürtelprüfung/markdown/6terKyu/05-NeWaza-Anwendung/04-AngriffOberlage.md
@@ -0,0 +1,18 @@
+---
+title: "Ein Angriff gegen Ukes Rückenlage - Tori kniet zwischen Ukes Beinen"
+video:
+    url: "videos/6terKyu/AnwendungNeWaza/Befreiungsprinzipien.webm"
+    width: 854
+    height: 480
+---
+## Stichpunkte
+
+- mit der rechten Hand Ukes rechtes Revers kontrollieren
+- mit der linken Hand unter Ukes rechtem Bein ebenfalls das rechte Revers greifen
+- mit der Schulter Ukes Bein nach vorne schieben und belasten
+- am Bein vorbeirutschen
+- und durch kontrolliertes Umgreifen zu Yoko-shio-gatame wechseln
+
+## Anmerkungen
+
+Aus der Standardsituation gegen die Rückenlage sinnvolle Lösungen herausarbeiten, die auch gegen Widerstand funktionieren.
diff --git a/DieJudoGürtelprüfung/markdown/6terKyu/05-NeWaza-Anwendung/05-AngriffUnterlage.md b/DieJudoGürtelprüfung/markdown/6terKyu/05-NeWaza-Anwendung/05-AngriffUnterlage.md
new file mode 100644
index 0000000..d6695ad
--- /dev/null
+++ b/DieJudoGürtelprüfung/markdown/6terKyu/05-NeWaza-Anwendung/05-AngriffUnterlage.md
@@ -0,0 +1,18 @@
+---
+title: "Ein Angriff aus der eigenen Rückenlage - Uke zwischen Toris Beinen"
+video:
+    url: "videos/6terKyu/AnwendungNeWaza/AngriffUnterlage.webm"
+    width: 854
+    height: 480
+---
+## Stichpunkte
+
+- aus der eigenen Rückenlage dem Partner entgegenstarten und um dessen Kopf greifen
+- gleichzeitig seinen nach vorne greifenden arm abfangen und am eigenen Kopf vorbeischieben
+- Ukes Arm fest zwischen den Köüfen einklemmen und den Griff sichern
+- Ukes Bein blockieren
+- auf den Rücken drehen und festhalten
+
+## Anmerkungen
+
+Aus der Standardsituation "eigene Rückenlage" sinnvolle Lösungen herausarbeiten, die auch gegen Widerstand funktionieren.
diff --git a/DieJudoGürtelprüfung/markdown/6terKyu/05-NeWaza-Anwendung/meta.yaml b/DieJudoGürtelprüfung/markdown/6terKyu/05-NeWaza-Anwendung/meta.yaml
new file mode 100644
index 0000000..7134aa2
--- /dev/null
+++ b/DieJudoGürtelprüfung/markdown/6terKyu/05-NeWaza-Anwendung/meta.yaml
@@ -0,0 +1,3 @@
+---
+title: "Anwendungsaufgabe Boden"
+---
diff --git a/DieJudoGürtelprüfung/markdown/6terKyu/06-Randori/01-Randori.md b/DieJudoGürtelprüfung/markdown/6terKyu/06-Randori/01-Randori.md
new file mode 100644
index 0000000..fd75d7d
--- /dev/null
+++ b/DieJudoGürtelprüfung/markdown/6terKyu/06-Randori/01-Randori.md
@@ -0,0 +1,13 @@
+---
+title: "Im Stand-Randori die erlernten Würfe kontrolliert werfen und bei Wurfversuchen sich durch Ausweichen verteidigen. Im Boden-Randori nachweisen, dass man einen sich ernsthaft verteidigenden Partner mit Haltegriff kontrollieren kann."
+video:
+    url: "videos/6terKyu/AnwendungNeWaza/AngriffUnterlage.webm"
+    width: 854
+    height: 480
+---
+Die Gesamtzeit für das Prüfungsfach Randori sollte mit mehrfachem Partnerwechsel 10 Minuten nicht überschreiten. Die beim Randori übenden Judoka sollen:
+
+- *nicht* mit den Armen sperren, *sondern* lockere, gebeugte Arme und einen aufrechten Kampfstiel zeigen ("schönes Judo")
+- *nicht* ausschließlich verteidigen, *sondern* auch entschlossen angreifen und zu werfen versuchen
+- *nicht* nur die Rolle von Tori demonstrieren, *sondern* auch entschlossen angreifen und zu werfen versuchen
+- am Boden *nicht* nur spielerisch miteinander raufen, *sondern* mit größeren Widerständen als im Stand auch das Kämpfen gegeneinander erproben.
diff --git a/DieJudoGürtelprüfung/markdown/6terKyu/06-Randori/meta.yaml b/DieJudoGürtelprüfung/markdown/6terKyu/06-Randori/meta.yaml
new file mode 100644
index 0000000..8b0ed9a
--- /dev/null
+++ b/DieJudoGürtelprüfung/markdown/6terKyu/06-Randori/meta.yaml
@@ -0,0 +1,3 @@
+---
+title: "Randori"
+---
diff --git a/DieJudoGürtelprüfung/markdown/6terKyu/07-Lexikon/01-Lexikon.md b/DieJudoGürtelprüfung/markdown/6terKyu/07-Lexikon/01-Lexikon.md
new file mode 100644
index 0000000..93cb4e3
--- /dev/null
+++ b/DieJudoGürtelprüfung/markdown/6terKyu/07-Lexikon/01-Lexikon.md
@@ -0,0 +1,13 @@
+---
+title: "Lexikon"
+---
+
+Die Prüflinge sollten vor allem die Begriffe kennen, die zum Bestehen der Prüfung notwendig sind, z.B. die Namen der geforderten Judotechniken.
+
+|  Nr.  | Japanisch       | Deutsch            |
+| :---: | :-------------- | :----------------- |
+|  22   | Ippon-seoi-nage | Punkt-Schulterwurf |
+|  23   | De-ashi-barei   | Fußfeger           |
+|  24   | Ko-uchi-gari    | kleine Innensichel |
+|  25   | Ko-soto-gari    | kleine Außensichel |
+|  26   | Gake            | Einhängen          |
diff --git a/DieJudoGürtelprüfung/markdown/6terKyu/07-Lexikon/meta.yaml b/DieJudoGürtelprüfung/markdown/6terKyu/07-Lexikon/meta.yaml
new file mode 100644
index 0000000..2e023cb
--- /dev/null
+++ b/DieJudoGürtelprüfung/markdown/6terKyu/07-Lexikon/meta.yaml
@@ -0,0 +1,3 @@
+---
+title: "Lexikon"
+---
\ No newline at end of file
diff --git a/DieJudoGürtelprüfung/markdown/6terKyu/meta.yaml b/DieJudoGürtelprüfung/markdown/6terKyu/meta.yaml
new file mode 100644
index 0000000..2d9e399
--- /dev/null
+++ b/DieJudoGürtelprüfung/markdown/6terKyu/meta.yaml
@@ -0,0 +1,3 @@
+---
+title: "6. Kyu - gelber-oranger Gürtel"
+---
\ No newline at end of file
diff --git a/DieJudoGürtelprüfung/markdown/7terKyu/01-Ukemi/01-Ushiro.md b/DieJudoGürtelprüfung/markdown/7terKyu/01-Ukemi/01-Ushiro.md
new file mode 100644
index 0000000..aee8306
--- /dev/null
+++ b/DieJudoGürtelprüfung/markdown/7terKyu/01-Ukemi/01-Ushiro.md
@@ -0,0 +1,18 @@
+---
+title: Fallen rückwärts
+video:
+    url: "videos/8terKyu/Ukemi/Ushiro.webm"
+    width: 854
+    height: 480 
+---
+## Stichpunkte
+
+- schulterbreiter, paralleler Stand
+- in die tiefe Hocke gehen
+- kräftiges, beidarmiges Abschlagen
+- Kinn auf die Brust
+- Beine bremsend in die Luft
+
+## Anmerkungen
+
+In dieser Stufe soll behutsam an die Falltechnik rückwärts zu beiden Seiten herangeführt werden. Fallen und Werfen soll möglichst gemeinsam unterrichtet werden. Die isolierte Falltechnik dient zur methodischen Vorbereitung des "Geworfenwerdens" und muss in dieser Stufe noch nicht perfekt aussehen. Sie kann auch langsam und aus geringer Höhe (tiefe Hocke oder gar sitzend) ausgeführt werden.
diff --git a/DieJudoGürtelprüfung/markdown/7terKyu/01-Ukemi/02-Yoko.md b/DieJudoGürtelprüfung/markdown/7terKyu/01-Ukemi/02-Yoko.md
new file mode 100644
index 0000000..042b58b
--- /dev/null
+++ b/DieJudoGürtelprüfung/markdown/7terKyu/01-Ukemi/02-Yoko.md
@@ -0,0 +1,18 @@
+---
+title: Fallen seitwärts zu beiden Seiten
+video:
+    url: "videos/8terKyu/Ukemi/Yoko.webm"
+    width: 854
+    height: 480
+---
+## Stichpunkte
+
+- Aus schulterbreitem Stand in die einbeinige Hocke
+- ein Bein vor dem anderen seitlich vorbeiführen
+- kräftiges, einarmiges Abschlagen
+- Kinn auf die Brust
+- zu beiden Seiten üben
+
+## Anmerkungen
+
+Als methodisches Hilfsmittel bietet es sich an, eine Socke über den vorbeizuführenden Fuß zu ziehen und diesen afgesetzt gleiten zu lassen. Um keine Langeweile aufkommen zu lassen, sollten Falltechniken im Kindesalter möglichst in Spielformen verpackt und abwechslungsreich gestaltet werden.
\ No newline at end of file
diff --git a/DieJudoGürtelprüfung/markdown/7terKyu/01-Ukemi/03-MaeMawari.md b/DieJudoGürtelprüfung/markdown/7terKyu/01-Ukemi/03-MaeMawari.md
new file mode 100644
index 0000000..e85d4d4
--- /dev/null
+++ b/DieJudoGürtelprüfung/markdown/7terKyu/01-Ukemi/03-MaeMawari.md
@@ -0,0 +1,19 @@
+---
+title: Judorolle vorwärts mit Liegenbleiben oder Aufstehen
+video:
+    url: "videos/7terKyu/Ukemi/MaeMawari.webm"
+    width: 854
+    height: 480
+---
+## Stichpunkte
+
+- über beide Arme stützen.
+- rund rollen
+- am Ende jeweils
+  - in der Endposition liegen bleiben,...
+  - bzw. weiter rollen und aufstehen
+- auf beiden Seiten üben, geprüft wird nur eine Seite
+
+## Anmerkungen
+
+Fallen rückwärts und seitwärts zu beiden Seiten wurde bereits in der vorigen Kyu-Stufe beschrieben und soll hier intensiviert werden und auf höherem Niveau durchgeführt werden. Die Judorolle (Mae-mawari-ukemi) fällt nicht jedem gleichermaßen leicht. Daher kann sie mit Liegenbleiben in der korrekten Endposition **oder** mit Aufstehen gezeigt werden. Beides soll nur in der Grobform verlangt werden.
diff --git a/DieJudoGürtelprüfung/markdown/7terKyu/01-Ukemi/meta.yaml b/DieJudoGürtelprüfung/markdown/7terKyu/01-Ukemi/meta.yaml
new file mode 100644
index 0000000..f2bd558
--- /dev/null
+++ b/DieJudoGürtelprüfung/markdown/7terKyu/01-Ukemi/meta.yaml
@@ -0,0 +1,3 @@
+---
+title: "Falltechniken"
+---
\ No newline at end of file
diff --git a/DieJudoGürtelprüfung/markdown/7terKyu/02-NageWaza-Grundform/01-OGoshi.md b/DieJudoGürtelprüfung/markdown/7terKyu/02-NageWaza-Grundform/01-OGoshi.md
new file mode 100644
index 0000000..132c9c8
--- /dev/null
+++ b/DieJudoGürtelprüfung/markdown/7terKyu/02-NageWaza-Grundform/01-OGoshi.md
@@ -0,0 +1,18 @@
+---
+title: "O-goshi"
+video:
+    url: "videos/7terKyu/NageWaza/OGoshi.webm"
+    width: 854
+    height: 480
+---
+## Stichpunkte
+
+- sicherer, schulterbreiter Stand
+- Rücken-Bauch-Kontakt
+- kontrolliertes Werfen durch Ausheben über die Hüfte
+- Uke sichern.
+- zu beiden Seiten üben, geprüft wird nur eine Seite
+
+## Anmerkungen
+
+In dieser Stufe sollte unbedingt der Wurf von O-goshi/Uki-goshi geübt werden, der zum 8.Kyu nicht geübt wurde. Beide Würfe sollten klar unterschieden werden.
diff --git a/DieJudoGürtelprüfung/markdown/7terKyu/02-NageWaza-Grundform/02-UkiGoshi.md b/DieJudoGürtelprüfung/markdown/7terKyu/02-NageWaza-Grundform/02-UkiGoshi.md
new file mode 100644
index 0000000..9481b7f
--- /dev/null
+++ b/DieJudoGürtelprüfung/markdown/7terKyu/02-NageWaza-Grundform/02-UkiGoshi.md
@@ -0,0 +1,19 @@
+---
+title: "Uki-goshi"
+video:
+    url: "videos/7terKyu/NageWaza/UkiGoshi.webm"
+    width: 854
+    height: 480
+---
+## Stichpunkte
+
+- sicherer, schulterbreiter Stand
+- Rücken-Bauch-Kontakt
+- kontrolliertes Werfen durch Rotation um die Hüfte
+- Uke sichern!
+- zu beiden Seiten üben, geprüft wird nur eine Seite
+
+## Anmerkungen
+
+In dieser Stufe soll eine der Wurftechniken zur anderen Seite gezeigt 
+werden. Wir empfehlen eine der beiden Hüftwürfe.
diff --git a/DieJudoGürtelprüfung/markdown/7terKyu/02-NageWaza-Grundform/03-OUchiGari.md b/DieJudoGürtelprüfung/markdown/7terKyu/02-NageWaza-Grundform/03-OUchiGari.md
new file mode 100644
index 0000000..bb5b949
--- /dev/null
+++ b/DieJudoGürtelprüfung/markdown/7terKyu/02-NageWaza-Grundform/03-OUchiGari.md
@@ -0,0 +1,19 @@
+---
+title: "O-uchi-gari"
+video:
+    url: "videos/7terKyu/NageWaza/OUchiGari.webm"
+    width: 854
+    height: 480
+---
+## Stichpunkte
+
+- aus leicht gegengleicher Ausgangslage
+- mit Nachstellschritt eng an den Partner
+- möglichts Bauch-Bauch-Kontakt
+- mit Kniekehle-Kniekehle-Kontakt sicheln
+- Partner frei fallen lassen
+- zu beiden Seiten üben, geprüft wird nur eine Seite
+
+## Anmerkungen
+
+Zum Erlernen des O-Uchi-Gari ist es einfacher, wenn Ukes zu sicheldes Bein leicht vorne steht. Den Partner beim Fallen loszulassen, erleichtert das Fallen nach hinten und verhindert das Mitfallen Toris.
diff --git a/DieJudoGürtelprüfung/markdown/7terKyu/02-NageWaza-Grundform/04-SeoiOtoshi.md b/DieJudoGürtelprüfung/markdown/7terKyu/02-NageWaza-Grundform/04-SeoiOtoshi.md
new file mode 100644
index 0000000..818b784
--- /dev/null
+++ b/DieJudoGürtelprüfung/markdown/7terKyu/02-NageWaza-Grundform/04-SeoiOtoshi.md
@@ -0,0 +1,19 @@
+---
+title: "s"
+video:
+    url: "videos/7terKyu/NageWaza/SeoiOtoshi.webm"
+    width: 854
+    height: 480
+---
+## Stichpunkte
+
+- sicherer, gegrätschter Stand
+- Rücken-Bauch-Kontakt
+- Griff an Ukes Revers
+- Ukes Oberarm fest einklemmen
+- kontrolliertes Werfen durch Ausheben und/oder Stürzenlassen
+- Uke sichern!
+
+## Anmerkungen
+
+Unter **Seoi-otoshi verstehen wir eine mit breitem Stand ausgeführte Form des ippon-seoi-nage**. Dabei soll Tori mit der Zughand über Ukes Arm ins Revers greifen. So kann die Kraft leichter übertragen und enger Körperkontakt aufgebaut werden.
diff --git a/DieJudoGürtelprüfung/markdown/7terKyu/02-NageWaza-Grundform/meta.yaml b/DieJudoGürtelprüfung/markdown/7terKyu/02-NageWaza-Grundform/meta.yaml
new file mode 100644
index 0000000..87c601a
--- /dev/null
+++ b/DieJudoGürtelprüfung/markdown/7terKyu/02-NageWaza-Grundform/meta.yaml
@@ -0,0 +1,3 @@
+---
+title: "Grundform der Wurftechnik"
+---
diff --git a/DieJudoGürtelprüfung/markdown/7terKyu/03-NeWaza-Grundform/01-KesaGatame.md b/DieJudoGürtelprüfung/markdown/7terKyu/03-NeWaza-Grundform/01-KesaGatame.md
new file mode 100644
index 0000000..3fbd40a
--- /dev/null
+++ b/DieJudoGürtelprüfung/markdown/7terKyu/03-NeWaza-Grundform/01-KesaGatame.md
@@ -0,0 +1,21 @@
+---
+title: Kesa-gatame
+video:
+    url: "videos/7terKyu/OsaeKomiWaza/KesaGatame.webm"
+    width: 854
+    height: 480
+---
+## Stichpunkte
+
+- Um den Nacken fassen, ohne diesen zu fest einzuklemmen.
+- Seite-Seite-Kontakt
+- Uke belasten.
+- Ukes Unterarm fest einklemmen.
+- Beine weit stützend auseinander.
+- Soll man zu beiden Seiten üben, geprüft wird nur eine Seite.
+
+## Anmerkungen
+
+Da die Haltegriffe prinzipiell beidseitig geübt werden, versteht es 
+sich von selbst, dass dies auch für die Befreiungen gilt, auch wenn 
+dies nicht unbedingt bei der Prüfung gezeigt werden muss.
diff --git a/DieJudoGürtelprüfung/markdown/7terKyu/03-NeWaza-Grundform/02-YokoShioGatame.md b/DieJudoGürtelprüfung/markdown/7terKyu/03-NeWaza-Grundform/02-YokoShioGatame.md
new file mode 100644
index 0000000..7704efd
--- /dev/null
+++ b/DieJudoGürtelprüfung/markdown/7terKyu/03-NeWaza-Grundform/02-YokoShioGatame.md
@@ -0,0 +1,20 @@
+---
+title: Yoko-shio-gatame
+video:
+    url: "videos/7terKyu/OsaeKomiWaza/YokoShioGatame.webm"
+    width: 854
+    height: 480
+---
+## Stichpunkte
+
+- Weit um Bein und Kopf greifen.
+- Mit dem Oberkörker belasten.
+- Mit den Beinen abstützen.
+- Das Hüftbein möglichts anziehen, um die Beinklammer zu verhindern.
+- Soll man zu beiden Seiten üben, geprüft wird nur eine Seite.
+
+## Anmerkungen
+
+Yoko-shio-gatame ist ein sehr erfolgreicher Haltegriff, den man ruhig 
+von Anfang an auch mit anderen Griffvarianten und früh gegen Widerstand 
+üben soll.
diff --git a/DieJudoGürtelprüfung/markdown/7terKyu/03-NeWaza-Grundform/03-TateShioGatame.md b/DieJudoGürtelprüfung/markdown/7terKyu/03-NeWaza-Grundform/03-TateShioGatame.md
new file mode 100644
index 0000000..4355051
--- /dev/null
+++ b/DieJudoGürtelprüfung/markdown/7terKyu/03-NeWaza-Grundform/03-TateShioGatame.md
@@ -0,0 +1,20 @@
+---
+title: Tate-shio-gatame
+video:
+    url: "videos/7terKyu/OsaeKomiWaza/TateShioGatame.webm"
+    width: 854
+    height: 480
+---
+## Stichpunkte
+
+- Kopf und Arm einklemmen, wie bei Kesa-gatame
+- oder als Variante im Kata-gatame-Stil
+- Auf dem Partner sitzend belasten.
+- Zur Verstärkung die Füße grätschen und damit von innen einhaken.
+- Soll man zu beiden Seiten üben, geprüft wird nur eine Seite.
+
+## Anmerkungen
+
+Sowohl das Einklemmen des Armes zwischen den beiden Köpfen, als auch 
+das grätschende Einhaken der Füße kann schmerzhaft sein. Nimm Rücksicht 
+auf Deinen Partner!
diff --git a/DieJudoGürtelprüfung/markdown/7terKyu/03-NeWaza-Grundform/04-KamiShioGatame.md b/DieJudoGürtelprüfung/markdown/7terKyu/03-NeWaza-Grundform/04-KamiShioGatame.md
new file mode 100644
index 0000000..aace92f
--- /dev/null
+++ b/DieJudoGürtelprüfung/markdown/7terKyu/03-NeWaza-Grundform/04-KamiShioGatame.md
@@ -0,0 +1,18 @@
+---
+title: Kami-shio-gatame
+video:
+    url: "videos/7terKyu/OsaeKomiWaza/KamiShioGatame.webm"
+    width: 854
+    height: 480
+---
+## Stichpunkte
+
+- Von hinten unter oder über Ukes Arme möglichst an den Gürtel greifen.
+- Mit Kopf und Oberkörper belasten.
+- Ukes Kopf frei lassen.
+- Mit den Beinen flexibel stützen.
+
+## Anmerkungen
+
+Es kann sehr unangenehm für Uke sein, wenn Tori bei Kami-shio-gatame 
+auf dessen Kopf liegt. Dass sollte man möglichst vermeiden.
diff --git a/DieJudoGürtelprüfung/markdown/7terKyu/03-NeWaza-Grundform/meta.yaml b/DieJudoGürtelprüfung/markdown/7terKyu/03-NeWaza-Grundform/meta.yaml
new file mode 100644
index 0000000..9ba3ebb
--- /dev/null
+++ b/DieJudoGürtelprüfung/markdown/7terKyu/03-NeWaza-Grundform/meta.yaml
@@ -0,0 +1,3 @@
+---
+title: "Grundform der Bodentechniken"
+---
diff --git a/DieJudoGürtelprüfung/markdown/7terKyu/04-TachiWaza-Anwendung/01-UkeSchiebt.md b/DieJudoGürtelprüfung/markdown/7terKyu/04-TachiWaza-Anwendung/01-UkeSchiebt.md
new file mode 100644
index 0000000..fc3bca5
--- /dev/null
+++ b/DieJudoGürtelprüfung/markdown/7terKyu/04-TachiWaza-Anwendung/01-UkeSchiebt.md
@@ -0,0 +1,22 @@
+---
+title: Wenn Uke schiebt und/oder vorkommt, wirft Tori z.B. Seoi-otoshi (oder Uki-goshi, oder O-goshi)
+video:
+    url: "videos/7terKyu/TachiWaza/SeoiOtoshi.webm"
+    width: 854
+    height: 480
+---
+## Stichpunkte
+
+- Ukes Druck ausnutzen.
+- sicherer, gegrätschter Stand
+- Rücken-Bauch-Kontakt
+- Griff an Ukes Revers
+- Ukes Oberarm fest einklemmen
+- kontrolliertes Werfen durch Ausheben und/oder Stürzenlassen
+
+## Anmerkungen
+
+Für Würfe nach vorne bietet sich eine günstige Wurfgelegenheit, wenn 
+sich das Lot von Ukes Körperschwertpunktes **vor** dessen Füßen 
+befindet. Ukes Druck soll so stark erfolgen, dass Tori die Würfe 
+technisch sauber ausführen kann
diff --git a/DieJudoGürtelprüfung/markdown/7terKyu/04-TachiWaza-Anwendung/02-UkeZieht.md b/DieJudoGürtelprüfung/markdown/7terKyu/04-TachiWaza-Anwendung/02-UkeZieht.md
new file mode 100644
index 0000000..59a7dea
--- /dev/null
+++ b/DieJudoGürtelprüfung/markdown/7terKyu/04-TachiWaza-Anwendung/02-UkeZieht.md
@@ -0,0 +1,23 @@
+---
+title: Wenn Uke zieht und/oder zurückgeht, wirft Tori O-uchi-gari
+video:
+    url: "videos/7terKyu/TachiWaza/OUchiGari.webm"
+    width: 854
+    height: 480
+---
+## Stichpunkte
+
+- Ukes Zug ausnutzen.
+- Das vordere Bein angreifen
+- Kniekehle-Kniekehle-Kontakt
+- Ukes Bein wegsicheln
+- Partner frei fallen lassen
+
+## Anmerkungen
+
+O-uchi-gari lässt sich besser am vorderen Bein werfen. Deshalb soll 
+Uke die Auslage wechseln oder Tori zieht so stark am Revers, dass Uke 
+einen Schritt vorkommt und gegenzieht. Wrfe nach hinten (z.B. 
+O-uchi-gari) können gut angewendet werden, wenn Ukes Körperschwerpunkt 
+(Hüfte/Gesäß) im Lot hinter Ukes Füßen ist. Ukes Zug soll so stark 
+erfolgen, dass Tori die Würfe technisch sauber ausführen kann.
diff --git a/DieJudoGürtelprüfung/markdown/7terKyu/04-TachiWaza-Anwendung/meta.yaml b/DieJudoGürtelprüfung/markdown/7terKyu/04-TachiWaza-Anwendung/meta.yaml
new file mode 100644
index 0000000..6426bf2
--- /dev/null
+++ b/DieJudoGürtelprüfung/markdown/7terKyu/04-TachiWaza-Anwendung/meta.yaml
@@ -0,0 +1,3 @@
+---
+title: "Anwendungsaufgabe Stand"
+---
diff --git a/DieJudoGürtelprüfung/markdown/7terKyu/05-NeWaza-Anwendung/01-Befreiung-KesaGatame.md b/DieJudoGürtelprüfung/markdown/7terKyu/05-NeWaza-Anwendung/01-Befreiung-KesaGatame.md
new file mode 100644
index 0000000..8a2b970
--- /dev/null
+++ b/DieJudoGürtelprüfung/markdown/7terKyu/05-NeWaza-Anwendung/01-Befreiung-KesaGatame.md
@@ -0,0 +1,19 @@
+---
+title: "Befreiung aus Kesa-gatame"
+video:
+    url: "videos/7terKyu/NeWaza/KesaGatame-Befreiung.webm"
+    width: 854
+    height: 480
+---
+## Stichpunkte
+
+- Übe unterschiedliche Befreiungen!
+  - unter den Schwerpunkt kommen und Uke überrollen
+  - oder zum Partner hin herausdrehen
+  - oder den Arm befreien und wegdrehen
+  - oder mit Ebi (siehe weiß-gelber Gürtel)
+  - oder kombiniere verschiedene Befreiungsprinzipien
+
+## Anmerkungen
+
+Durch die Kombination mindestens zweier Befreiungsprinzipiebn kannst Du den Partner in die Falle locken.
diff --git a/DieJudoGürtelprüfung/markdown/7terKyu/05-NeWaza-Anwendung/02-Befreiung-YokoShioGatame.md b/DieJudoGürtelprüfung/markdown/7terKyu/05-NeWaza-Anwendung/02-Befreiung-YokoShioGatame.md
new file mode 100644
index 0000000..4cd39dd
--- /dev/null
+++ b/DieJudoGürtelprüfung/markdown/7terKyu/05-NeWaza-Anwendung/02-Befreiung-YokoShioGatame.md
@@ -0,0 +1,18 @@
+---
+title: "Befreiung aus Yoko-shio-gatame"
+video:
+    url: "videos/7terKyu/NeWaza/YokoShioGatame-Befreiung.webm"
+    width: 854
+    height: 480
+---
+## Stichpunkte
+
+- Kopf wegschieben
+- Bein über Kopf
+- um Ukes Bein greifen
+- parallel werden
+- Befreien durch Überrollen
+
+## Anmerkungen
+
+Bei Befreiungen muss sich Uke so verhalten, dass Toriu sich befreien kann. **Mache es Deinem Partner schwer, aber nur so schwer, dass er es unter Anstrengung schaffen kann!**" Diser Satz hat grundlegenden Charakter und gilt für fast alle Anwendungsaufgaben unseres Systemes.
diff --git a/DieJudoGürtelprüfung/markdown/7terKyu/05-NeWaza-Anwendung/03-Befreiung-TateShioGatame.md b/DieJudoGürtelprüfung/markdown/7terKyu/05-NeWaza-Anwendung/03-Befreiung-TateShioGatame.md
new file mode 100644
index 0000000..eae7ad2
--- /dev/null
+++ b/DieJudoGürtelprüfung/markdown/7terKyu/05-NeWaza-Anwendung/03-Befreiung-TateShioGatame.md
@@ -0,0 +1,17 @@
+---
+title: "Befreiung aus Tate-shio-gatame"
+video:
+    url: "videos/7terKyu/NeWaza/TateShioGatame-Befreiung.webm"
+    width: 854
+    height: 480
+---
+## Stichpunkte
+
+- Ein Bein von Uke wegschieben.
+- Befreiung durch Beinklammer
+- Ausnutzen von Gegendruck
+- Anschließend möglichts überrollen und selbs halten
+
+## Anmerkungen
+
+Die Kunst bei allen Aufgaben am Boden besteht darin, den Widerstand so zu dosieren, dass Tori mit Anstrengung die gestellte Aufgabe lösen kann.
diff --git a/DieJudoGürtelprüfung/markdown/7terKyu/05-NeWaza-Anwendung/04-Befreiung-KamiShioGatame.md b/DieJudoGürtelprüfung/markdown/7terKyu/05-NeWaza-Anwendung/04-Befreiung-KamiShioGatame.md
new file mode 100644
index 0000000..bfab770
--- /dev/null
+++ b/DieJudoGürtelprüfung/markdown/7terKyu/05-NeWaza-Anwendung/04-Befreiung-KamiShioGatame.md
@@ -0,0 +1,17 @@
+---
+title: "Befreiung aus Kami-shio-gatame"
+video:
+    url: "videos/7terKyu/NeWaza/KamiShioGatame-Befreiung.webm"
+    width: 854
+    height: 480
+---
+## Stichpunkte
+
+- Mit beiden Beinen zu einer Seite Druck aufbauen.
+- Gegendruck ausnutzen.
+- Griff an Ukes Revers
+- Uke berrollen und selbst halten.
+
+## Anmerkungen
+
+Das Ausnutzen des Gegendruckes ist eine wichtige Grundlage des Bodenkampfes und sollte deshalb unbedingt zu beiden Seiten geübt werden.
diff --git a/DieJudoGürtelprüfung/markdown/7terKyu/05-NeWaza-Anwendung/05-AngriffGgBank.md b/DieJudoGürtelprüfung/markdown/7terKyu/05-NeWaza-Anwendung/05-AngriffGgBank.md
new file mode 100644
index 0000000..c218c58
--- /dev/null
+++ b/DieJudoGürtelprüfung/markdown/7terKyu/05-NeWaza-Anwendung/05-AngriffGgBank.md
@@ -0,0 +1,22 @@
+---
+title: "Einen Angriff gegen Ukes Bankposition mit einem Haltegriff beenden"
+video:
+    url: "videos/7terKyu/NeWaza/AngriffGgBank.webm"
+    width: 854
+    height: 480
+---
+## Stichbpunkte
+
+- Von der Seite mit beiden Händen Ukes Sttz wegziehen oder blockieren.
+- Mit der Brust Uke über die blockierte Stütze drücken.
+- Möglichst schnell umgreifen und Uke z.B. mit Yoko-shio-gatame festhalten
+- Weitere Varianten des Umdrehens von beiden Seiten her üben
+
+## Anmerkungen
+
+Wir unterscheiden:
+
+- hohe Bank: auf Händen und Unterarmen
+- mittlere Bank: Unterarme, Unterschenkel, "Luft" unter dem Bauch
+- niedrige Bank: ganz eng zusammengekauert
+- Bauchlage: flach gestreckt auf dem Bauch
diff --git a/DieJudoGürtelprüfung/markdown/7terKyu/05-NeWaza-Anwendung/06-AngriffGgBauch.md b/DieJudoGürtelprüfung/markdown/7terKyu/05-NeWaza-Anwendung/06-AngriffGgBauch.md
new file mode 100644
index 0000000..b4d3971
--- /dev/null
+++ b/DieJudoGürtelprüfung/markdown/7terKyu/05-NeWaza-Anwendung/06-AngriffGgBauch.md
@@ -0,0 +1,18 @@
+---
+title: "Einen Angriff gegen Ukes Bauchposition mit einem Haltegriff beenden"
+video:
+    url: "videos/7terKyu/NeWaza/AngriffGgBauch.webm"
+    width: 854
+    height: 480
+---
+## Stichpunkte
+
+- Schräg vom Kopf her mit der rechten Hand in Ukes Gürtel
+- Toris rechtes Knie eng an/unter Ukes linke Schulter
+- Unter Ukes rechtem Arm auf das eigene Handgelenk greifen
+- Uke kreisförmig mit engem Brustkontakt auf den Rücken drehen
+- und in der Endposition festhalten
+
+## Anmerkungen
+
+**Achtung!** Bei dieser Technik sollte Uke unbedingt den eigenen rechten Arm schützen, indem er in den eigenen Gürtel greift.
diff --git a/DieJudoGürtelprüfung/markdown/7terKyu/05-NeWaza-Anwendung/07-Haltegriffwechsel.md b/DieJudoGürtelprüfung/markdown/7terKyu/05-NeWaza-Anwendung/07-Haltegriffwechsel.md
new file mode 100644
index 0000000..0bd7669
--- /dev/null
+++ b/DieJudoGürtelprüfung/markdown/7terKyu/05-NeWaza-Anwendung/07-Haltegriffwechsel.md
@@ -0,0 +1,18 @@
+---
+title: "Einen Haltegriffwechsel unter Ausnutzung von Ukes Befreiungsversuch"
+video:
+    url: "videos/7terKyu/NeWaza/Haltegriffwechsel.webm"
+    width: 854
+    height: 480
+---
+## Stichpunkte
+
+- Uke versucht, sich aus einer Variante der Yoko-shio-gatame zu befreien
+- Er baut Druck -Gegendruckauf und versucht, Tori zu überrollen
+- Nutze dies aus und wandere mit
+- Grätsche die Beine
+- Und halte Kami-shio-gatame
+
+## Anmerkungen
+
+Übe im Training auch Haltegriffwechsel mit den anderen Techniken, die Du bereits kannst. Nute immer den Befreiungsversuch von Uke, um in den nächsten Haltegriff zu wechseln.
diff --git a/DieJudoGürtelprüfung/markdown/7terKyu/05-NeWaza-Anwendung/meta.yaml b/DieJudoGürtelprüfung/markdown/7terKyu/05-NeWaza-Anwendung/meta.yaml
new file mode 100644
index 0000000..7134aa2
--- /dev/null
+++ b/DieJudoGürtelprüfung/markdown/7terKyu/05-NeWaza-Anwendung/meta.yaml
@@ -0,0 +1,3 @@
+---
+title: "Anwendungsaufgabe Boden"
+---
diff --git a/DieJudoGürtelprüfung/markdown/7terKyu/06-Randori/01-Randori.md b/DieJudoGürtelprüfung/markdown/7terKyu/06-Randori/01-Randori.md
new file mode 100644
index 0000000..8b4ad01
--- /dev/null
+++ b/DieJudoGürtelprüfung/markdown/7terKyu/06-Randori/01-Randori.md
@@ -0,0 +1,23 @@
+---
+title: "Boden-Randori beginnen, nachdem Uke nach einem Wurf eine korrekte Falltechnik gemacht hat"
+video:
+    url: "videos/7terKyu/Randori/Randori.webm"
+    width: 854
+    height: 480
+---
+## Anmerkung
+
+Es sollten ca. 4-6 kurze Randoris durchgeführt werden. Dazu sind im 
+Training allerdings höhere Umfänge notwendig, d.h. mehrere Randoris 
+mit längeren Übungszeiten. Im Randori werden immer beide Partner 
+gleichzeitig und gemeinsam bewertet.
+
+## Stichpunkte
+
+Die beim Randori übenden Judoka sollen:
+
+- **Das Boden-Randori jeweils durch eine korrekte Wurftechnik 
+einleiten**.
+- **Nicht** mit Uke gemeinsam zu Boden gehen, **sondern** erst Hilfe 
+beim Fallen geben und dann den Haltegriff ansetzen; danach beginnt ein 
+Randori von ca. 30 Sekunden Dauer; dann Rollenwechsel.
diff --git a/DieJudoGürtelprüfung/markdown/7terKyu/06-Randori/meta.yaml b/DieJudoGürtelprüfung/markdown/7terKyu/06-Randori/meta.yaml
new file mode 100644
index 0000000..8b0ed9a
--- /dev/null
+++ b/DieJudoGürtelprüfung/markdown/7terKyu/06-Randori/meta.yaml
@@ -0,0 +1,3 @@
+---
+title: "Randori"
+---
diff --git a/DieJudoGürtelprüfung/markdown/7terKyu/07-Lexikon/01-Lexikon.md b/DieJudoGürtelprüfung/markdown/7terKyu/07-Lexikon/01-Lexikon.md
new file mode 100644
index 0000000..3d789d9
--- /dev/null
+++ b/DieJudoGürtelprüfung/markdown/7terKyu/07-Lexikon/01-Lexikon.md
@@ -0,0 +1,21 @@
+---
+title: Lexikon
+---
+## Anmerkungen
+
+Die Prüflinge sollten vor allem die Begriffe kennen, die zum Bestehen der Prüfung notwendig sind, z.B. die Namen der geforderten Judotechniken.
+
+## Vokabeln
+
+|  Nr. |        Japanisch | Deutsch                                                                                           |
+| ---: | ---------------: | :------------------------------------------------------------------------------------------------ |
+|   12 |         Ai-yotsu | gleicher Griff und gleiche Ausgangslage: rechts gegen rechts oder links gegen links               |
+|   13 |      O-uchi-gari | große Innensichel                                                                                 |
+|   14 |      Seoi-otoshi | auf den Rücken nehmen und hinunterstürzen                                                         |
+|   15 |           Otoshi | stürzen, Uke wird am Bein oder Fuß von vorne oder hinten blockiert und über diesen Block geworfen |
+|   16 |             Gari | sicheln, ein belastetes Beinvon Uke wird mit der Fußsohle/dem Bein weggerissen                    |
+|   17 |      Kesa-gatame | Schärpen-Haltegriff                                                                               |
+|   18 | Yoko-shio-gatame | Seitvierer, Vier-Punkt-Haltegriff von der Seite                                                   |
+|   19 | Tate-shio-gatame | Reitvierer, Vier-Punkt-Haltegriff von oben                                                        |
+|   20 | Kami-shio-gatame | Kopfvierer, Vier-Punkt-Haltegriff vom Kopf her                                                    |
+|   21 | Mae-mawari-ukemi | Judorolle vorwörts mit Liegenbleiben oder aufstehen                                               |
diff --git a/DieJudoGürtelprüfung/markdown/7terKyu/07-Lexikon/meta.yaml b/DieJudoGürtelprüfung/markdown/7terKyu/07-Lexikon/meta.yaml
new file mode 100644
index 0000000..2e023cb
--- /dev/null
+++ b/DieJudoGürtelprüfung/markdown/7terKyu/07-Lexikon/meta.yaml
@@ -0,0 +1,3 @@
+---
+title: "Lexikon"
+---
\ No newline at end of file
diff --git a/DieJudoGürtelprüfung/markdown/7terKyu/meta.yaml b/DieJudoGürtelprüfung/markdown/7terKyu/meta.yaml
new file mode 100644
index 0000000..c097872
--- /dev/null
+++ b/DieJudoGürtelprüfung/markdown/7terKyu/meta.yaml
@@ -0,0 +1,3 @@
+---
+title: "7. Kyu - gelber Gürtel"
+---
\ No newline at end of file
diff --git a/DieJudoGürtelprüfung/markdown/8terKyu/01-Ukemi/00-Ushiro.md b/DieJudoGürtelprüfung/markdown/8terKyu/01-Ukemi/00-Ushiro.md
new file mode 100644
index 0000000..aee8306
--- /dev/null
+++ b/DieJudoGürtelprüfung/markdown/8terKyu/01-Ukemi/00-Ushiro.md
@@ -0,0 +1,18 @@
+---
+title: Fallen rückwärts
+video:
+    url: "videos/8terKyu/Ukemi/Ushiro.webm"
+    width: 854
+    height: 480 
+---
+## Stichpunkte
+
+- schulterbreiter, paralleler Stand
+- in die tiefe Hocke gehen
+- kräftiges, beidarmiges Abschlagen
+- Kinn auf die Brust
+- Beine bremsend in die Luft
+
+## Anmerkungen
+
+In dieser Stufe soll behutsam an die Falltechnik rückwärts zu beiden Seiten herangeführt werden. Fallen und Werfen soll möglichst gemeinsam unterrichtet werden. Die isolierte Falltechnik dient zur methodischen Vorbereitung des "Geworfenwerdens" und muss in dieser Stufe noch nicht perfekt aussehen. Sie kann auch langsam und aus geringer Höhe (tiefe Hocke oder gar sitzend) ausgeführt werden.
diff --git a/DieJudoGürtelprüfung/markdown/8terKyu/01-Ukemi/01-Yoko.md b/DieJudoGürtelprüfung/markdown/8terKyu/01-Ukemi/01-Yoko.md
new file mode 100644
index 0000000..042b58b
--- /dev/null
+++ b/DieJudoGürtelprüfung/markdown/8terKyu/01-Ukemi/01-Yoko.md
@@ -0,0 +1,18 @@
+---
+title: Fallen seitwärts zu beiden Seiten
+video:
+    url: "videos/8terKyu/Ukemi/Yoko.webm"
+    width: 854
+    height: 480
+---
+## Stichpunkte
+
+- Aus schulterbreitem Stand in die einbeinige Hocke
+- ein Bein vor dem anderen seitlich vorbeiführen
+- kräftiges, einarmiges Abschlagen
+- Kinn auf die Brust
+- zu beiden Seiten üben
+
+## Anmerkungen
+
+Als methodisches Hilfsmittel bietet es sich an, eine Socke über den vorbeizuführenden Fuß zu ziehen und diesen afgesetzt gleiten zu lassen. Um keine Langeweile aufkommen zu lassen, sollten Falltechniken im Kindesalter möglichst in Spielformen verpackt und abwechslungsreich gestaltet werden.
\ No newline at end of file
diff --git a/DieJudoGürtelprüfung/markdown/8terKyu/01-Ukemi/meta.yaml b/DieJudoGürtelprüfung/markdown/8terKyu/01-Ukemi/meta.yaml
new file mode 100644
index 0000000..f2bd558
--- /dev/null
+++ b/DieJudoGürtelprüfung/markdown/8terKyu/01-Ukemi/meta.yaml
@@ -0,0 +1,3 @@
+---
+title: "Falltechniken"
+---
\ No newline at end of file
diff --git a/DieJudoGürtelprüfung/markdown/8terKyu/02-NageWaza-Grundform/01-OGoshiUkiGoshi.md b/DieJudoGürtelprüfung/markdown/8terKyu/02-NageWaza-Grundform/01-OGoshiUkiGoshi.md
new file mode 100644
index 0000000..c7f7f7c
--- /dev/null
+++ b/DieJudoGürtelprüfung/markdown/8terKyu/02-NageWaza-Grundform/01-OGoshiUkiGoshi.md
@@ -0,0 +1,18 @@
+---
+title: "O-goshi oder Uki-goshi"
+video:
+    url: "videos/8terKyu/NageWaza/OGoshiUkiGoshi.webm"
+    width: 854
+    height: 480
+---
+## Stichpunkte
+
+- sicherer, schulterbreiter Stand
+- Rücken-Bauch-Kontakt
+- kontrolliertes Werfen um oder über die Hüfte
+- Uke sichern.
+- Kann man zu beiden Seiten üben, geprüft wird nur eine Seite.
+
+## Anmerkungen
+
+Die beiden Partner müssen sich so verhalten (können), dass der andere das Werfen/Fallen lernen kann. Es ist also notwendig, das richtige Verhalten von Uke genauso auszubilden, wie das von Tori. Der verlangte Wurf kann auch "überdeutlich" im  Stand ausgeführt werden.
diff --git a/DieJudoGürtelprüfung/markdown/8terKyu/02-NageWaza-Grundform/02-BeidbeinigeEindrehtechnik.md b/DieJudoGürtelprüfung/markdown/8terKyu/02-NageWaza-Grundform/02-BeidbeinigeEindrehtechnik.md
new file mode 100644
index 0000000..723047f
--- /dev/null
+++ b/DieJudoGürtelprüfung/markdown/8terKyu/02-NageWaza-Grundform/02-BeidbeinigeEindrehtechnik.md
@@ -0,0 +1,18 @@
+---
+title: "Oder - anstatt der Hüfttechnik - eine beidbeinige Eindrehtechnik aus dem Ärmel-Revers-Griff"
+video:
+    url: "videos/8terKyu/NageWaza/BeidbeinigeEindrehtechnik.webm"
+    width: 854
+    height: 480
+---
+## Stichpunkte
+
+- sicherer, breiter Stand
+- deutlicher Einsatz von Hub- und Zugarm
+- kontrolliertes Werfen über das blockierende Bein
+- Uke sichern.
+- zu beiden Seiten üben, geprüft wird nur eine Seite
+
+## Anmerkungen
+
+Viele Judotrainer bevorzugen in ihrer Anfängermethodik der Grgundausbildung den Ärmel-Revers-Griff. So können anstatt O-goshi/Uki-goshi in der gesamten Grundausbildung auch Techniken wie Tsuri-komi-goshi, Morote-seoi-nage oder - wie hier - Tai-otoshi unterichtet werden.
diff --git a/DieJudoGürtelprüfung/markdown/8terKyu/02-NageWaza-Grundform/03-OSotoOtoshi.md b/DieJudoGürtelprüfung/markdown/8terKyu/02-NageWaza-Grundform/03-OSotoOtoshi.md
new file mode 100644
index 0000000..424be45
--- /dev/null
+++ b/DieJudoGürtelprüfung/markdown/8terKyu/02-NageWaza-Grundform/03-OSotoOtoshi.md
@@ -0,0 +1,18 @@
+---
+title: "O-soto-otoshi"
+video:
+    url: "videos/8terKyu/NageWaza/OSotoOtoshi.webm"
+    width: 854
+    height: 480
+---
+## Stichpunkte
+
+- sicherer, breiter Stand
+- deutlicher Einsatz von Hub- und Zugarm
+- kontrolliertes Werfen über das blockierende Bein
+- Uke sichern.
+- zu beiden Seiten üben, geprüft wird nur eine Seite
+
+## Anmerkungen
+
+Unter **O-soto-otoshi** verstehen wir das Aufsetzen eines Beines von außen hinter einem Bein des Partners bei gleichzeitgem engen Kontakt der Schultern und der Körperseite. Diese Technik ermöglicht es Kindern, auf beiden Beinen Stehend zu werfen und ihr eigenes Gleichgewicht zu bewahren, um so den Fall des Partners zu kontrollieren, was vor allem jüngeren Kindern bei einem O-soto-gari nicht gut gelingt.
diff --git a/DieJudoGürtelprüfung/markdown/8terKyu/02-NageWaza-Grundform/meta.yaml b/DieJudoGürtelprüfung/markdown/8terKyu/02-NageWaza-Grundform/meta.yaml
new file mode 100644
index 0000000..7a94055
--- /dev/null
+++ b/DieJudoGürtelprüfung/markdown/8terKyu/02-NageWaza-Grundform/meta.yaml
@@ -0,0 +1,3 @@
+---
+title: "Grundform der Wurftechniken"
+---
diff --git a/DieJudoGürtelprüfung/markdown/8terKyu/03-NeWaza-Grundform/01-KesaGatame.md b/DieJudoGürtelprüfung/markdown/8terKyu/03-NeWaza-Grundform/01-KesaGatame.md
new file mode 100644
index 0000000..2e780a0
--- /dev/null
+++ b/DieJudoGürtelprüfung/markdown/8terKyu/03-NeWaza-Grundform/01-KesaGatame.md
@@ -0,0 +1,17 @@
+---
+title: "Kesa-gatame"
+video:
+    url: "videos/8terKyu/OsaeKomiWaza/KesaGatame.webm"
+    width: 854
+    height: 480
+---
+## Stichpunkte
+
+- Seite-Seite-Kontakt
+- belasten
+- enge Kontrolle
+- zu beiden Seiten üben, geprüft wird nur eine Seite
+
+## Anmerkungen
+
+Wir nehmen Kuzure-Kesa-gatame als Einstiegstechnik, weil bei diesem Griff unter Arm und Schulter statt Nacken gefasst wird. Viele Judoanfänger erleben das Einklemmen des Kopfes ("Schwitzkasten") als schmerzhaft und bedrohlich für ihren Nacken. Deshalb wird Hon-kesa-gatame in der nächsten Stufe eingeführt.
diff --git a/DieJudoGürtelprüfung/markdown/8terKyu/03-NeWaza-Grundform/02-MuneGatame.md b/DieJudoGürtelprüfung/markdown/8terKyu/03-NeWaza-Grundform/02-MuneGatame.md
new file mode 100644
index 0000000..d7fe3e5
--- /dev/null
+++ b/DieJudoGürtelprüfung/markdown/8terKyu/03-NeWaza-Grundform/02-MuneGatame.md
@@ -0,0 +1,17 @@
+---
+title: "Mune-gatame"
+video:
+    url: "videos/8terKyu/OsaeKomiWaza/MuneGatame.webm"
+    width: 854
+    height: 480
+---
+## Stichpunkte
+
+- Bruds-Brust-Kontakt
+- belasten
+- enge Kontrolle
+- zu beiden Seiten üben, geprüft wird nur eine Seite.
+
+## Anmerkungen
+
+Die Partner müssen die Technik korrekt demonstrieren und deutlich machen, dass sie mit der geforderten Technik Uke am Boden kontrollieren können.
diff --git a/DieJudoGürtelprüfung/markdown/8terKyu/03-NeWaza-Grundform/meta.yaml b/DieJudoGürtelprüfung/markdown/8terKyu/03-NeWaza-Grundform/meta.yaml
new file mode 100644
index 0000000..9ba3ebb
--- /dev/null
+++ b/DieJudoGürtelprüfung/markdown/8terKyu/03-NeWaza-Grundform/meta.yaml
@@ -0,0 +1,3 @@
+---
+title: "Grundform der Bodentechniken"
+---
diff --git a/DieJudoGürtelprüfung/markdown/8terKyu/04-TachiWaza-Anwendung/01-UebergangStandBoden.md b/DieJudoGürtelprüfung/markdown/8terKyu/04-TachiWaza-Anwendung/01-UebergangStandBoden.md
new file mode 100644
index 0000000..8547099
--- /dev/null
+++ b/DieJudoGürtelprüfung/markdown/8terKyu/04-TachiWaza-Anwendung/01-UebergangStandBoden.md
@@ -0,0 +1,16 @@
+---
+title: "Den Partner kontrolliert werfen mit anschließendem Haltegriff und nachfolgender Befreiung von Uke"
+video:
+    url: "videos/8terKyu/TachiWaza/UebergangStandBoden.webm"
+    width: 854
+    height: 480
+---
+## Stichpunkte
+
+- z.B. mit O-soto-otoshi werfen
+- mit der Hand abstützen
+- Kuzure-kesa-gatame halten
+
+## Anmerkungen
+
+Werfen und Fallen soll mit halten und Befreien verbunden werden, damit der Anfänger einen Überblick über die technischen Möglichkeiten des Judo erhält. Es wird erwartet, dass die Partner angemessen kooperieren.
diff --git a/DieJudoGürtelprüfung/markdown/8terKyu/04-TachiWaza-Anwendung/meta.yaml b/DieJudoGürtelprüfung/markdown/8terKyu/04-TachiWaza-Anwendung/meta.yaml
new file mode 100644
index 0000000..f623d3f
--- /dev/null
+++ b/DieJudoGürtelprüfung/markdown/8terKyu/04-TachiWaza-Anwendung/meta.yaml
@@ -0,0 +1,3 @@
+---
+title: "Anwendungsaufgaben Stand"
+---
diff --git a/DieJudoGürtelprüfung/markdown/8terKyu/05-NeWaza-Anwendung/01-BefreiungOsaeKomiWaza.md b/DieJudoGürtelprüfung/markdown/8terKyu/05-NeWaza-Anwendung/01-BefreiungOsaeKomiWaza.md
new file mode 100644
index 0000000..44d6c63
--- /dev/null
+++ b/DieJudoGürtelprüfung/markdown/8terKyu/05-NeWaza-Anwendung/01-BefreiungOsaeKomiWaza.md
@@ -0,0 +1,16 @@
+---
+title: "Befreiung durch \"Ebi\""
+video:
+    url: "videos/8terKyu/NeWaza/BefreiungOsaeKomi.webm"
+    width: 854
+    height: 480
+---
+## Stichpunkte
+
+- Uke schwingt die Beine nach oben...
+- ...schiebt mit dem Schwung die Hüfte weg von Tori...
+- ...und befreit sich durch Aufrichten des Oberkörpers.
+  
+## Anmerkungen
+
+In diesem Falle wirft Tori kontrolliert mit O-soto-otoshi rechts und stützt sich mit der rechten Hand ab, damit er nicht auf den Partner fällt. Er nimmt Uke in Kuzure-kesa-gatame, hält aber nur so stark, dass Uke sich unter Anstrengung mit Gang oder Schwung zur Seite (Ebi) befreien kann. In der Ausbildung soll eine zweite Verkettung - z.B. Werfen mit einer Eindrehtechnik, Halten mit Mune-gatame und Befreien durch Überrollen - geübt werden. In der Prüfung muss aber nur eine Verkettung gezeigt werden.
diff --git a/DieJudoGürtelprüfung/markdown/8terKyu/05-NeWaza-Anwendung/meta.yaml b/DieJudoGürtelprüfung/markdown/8terKyu/05-NeWaza-Anwendung/meta.yaml
new file mode 100644
index 0000000..7134aa2
--- /dev/null
+++ b/DieJudoGürtelprüfung/markdown/8terKyu/05-NeWaza-Anwendung/meta.yaml
@@ -0,0 +1,3 @@
+---
+title: "Anwendungsaufgabe Boden"
+---
diff --git a/DieJudoGürtelprüfung/markdown/8terKyu/06-Randori/01-Randori.md b/DieJudoGürtelprüfung/markdown/8terKyu/06-Randori/01-Randori.md
new file mode 100644
index 0000000..ba0369d
--- /dev/null
+++ b/DieJudoGürtelprüfung/markdown/8terKyu/06-Randori/01-Randori.md
@@ -0,0 +1,8 @@
+---
+title: "Aus dem Kniestand das Boden-Randori beginnen, d.h. freies Kämpfen um die erlernten Haltegriffe und Befreiungen zu erproben"
+video:
+    url: "videos/8terKyu/Randori/Randori.webm"
+    width: 854
+    height: 480
+---
+Die einzelnen Boden-Randoris sollten nicht länger als eine Minute dauern, die Gesamtprüfungszeit nicht viel mehr als fünf Minuten. Dazu sind im Training höhere Umfänge notwendig, d.h. mehrere Randoris mit längeren Übungszeiten. Die beim Randori übenden Judoka sollen sich **nicht** als Sieger und Besiegte fühlen, **sondern** wissen, dass beide durch das Studium der Judotechniken aus der Bewegung gewinnen und **nicht** mit maximalen Kraftaufwand und völlig verbisssen **kämpfen**, sondern sich mit viel Bewegung "spielerisch balgen".
diff --git a/DieJudoGürtelprüfung/markdown/8terKyu/06-Randori/meta.yaml b/DieJudoGürtelprüfung/markdown/8terKyu/06-Randori/meta.yaml
new file mode 100644
index 0000000..8b0ed9a
--- /dev/null
+++ b/DieJudoGürtelprüfung/markdown/8terKyu/06-Randori/meta.yaml
@@ -0,0 +1,3 @@
+---
+title: "Randori"
+---
diff --git a/DieJudoGürtelprüfung/markdown/8terKyu/07-Lexikon/01-Lexikon.md b/DieJudoGürtelprüfung/markdown/8terKyu/07-Lexikon/01-Lexikon.md
new file mode 100644
index 0000000..82e6509
--- /dev/null
+++ b/DieJudoGürtelprüfung/markdown/8terKyu/07-Lexikon/01-Lexikon.md
@@ -0,0 +1,18 @@
+---
+title: "Lexikon/neue japanische Begriffe"
+---
+Die Prüflinge sollten vor allem die Begriffe kennen, die zum Bestehen der Prüfung notwendig sind, z.B. die Namen der geforderten Judotechniken.
+
+|  Nr. |          Japanisch | Deutsch                                                     |
+| ---: | -----------------: | :---------------------------------------------------------- |
+|    1 | Kuzure-kesa-gatame | Variante des Schärpen-Haltegriffes                          |
+|    2 |        Mune-gatame | Brust-Haltegriff, Variante der Yoko-shio-gatame             |
+|    3 |            O-goshi | großer Hüftwurf                                             |
+|    4 |          Uki-goshi | Hüftschwung                                                 |
+|    5 |         Tai-otoshi | Körpersturz                                                 |
+|    6 |      O-soto-otoshi | großer Außensturz                                           |
+|    7 |               Tori | derjenige, der eine Aktion macht (wörtlich Greifer)         |
+|    8 |                Uke | derjenige, an dem die Aktion gemacht wird (wörtlich Nehmer) |
+|    9 |         Ukemi-waza | Falltechnik                                                 |
+|   10 |                Rei | Gruß                                                        |
+|   11 |            Randori | freies Üben                                                 |
diff --git a/DieJudoGürtelprüfung/markdown/8terKyu/07-Lexikon/meta.yaml b/DieJudoGürtelprüfung/markdown/8terKyu/07-Lexikon/meta.yaml
new file mode 100644
index 0000000..f6f7ebc
--- /dev/null
+++ b/DieJudoGürtelprüfung/markdown/8terKyu/07-Lexikon/meta.yaml
@@ -0,0 +1,3 @@
+---
+title: "Lexikon"
+---
diff --git a/DieJudoGürtelprüfung/markdown/8terKyu/meta.yaml b/DieJudoGürtelprüfung/markdown/8terKyu/meta.yaml
new file mode 100644
index 0000000..dd39440
--- /dev/null
+++ b/DieJudoGürtelprüfung/markdown/8terKyu/meta.yaml
@@ -0,0 +1,3 @@
+---
+title: "8. Kyu - weiß-gelber Gürtel"
+---
\ No newline at end of file
diff --git a/homepage/redesign2018/markdownExperiment/config/.htaccess b/homepage/config/.htaccess
similarity index 100%
rename from homepage/redesign2018/markdownExperiment/config/.htaccess
rename to homepage/config/.htaccess
diff --git a/homepage/config/cwsvJudo.config.php b/homepage/config/cwsvJudo.config.php
new file mode 100644
index 0000000..2cee126
--- /dev/null
+++ b/homepage/config/cwsvJudo.config.php
@@ -0,0 +1,6 @@
+<?php
+$cwsvJudoConfig["db"]["host"]     = "127.0.0.1";
+$cwsvJudoConfig["db"]["name"]     = "cwsvjudo";
+$cwsvJudoConfig["db"]["user"]     = "cwsvjudo";
+$cwsvJudoConfig["db"]["password"] = "***REMOVED***";
+?>
diff --git a/homepage/redesign2018/markdownExperiment/config/phpcount.config.php b/homepage/config/phpcount.config.php
similarity index 100%
rename from homepage/redesign2018/markdownExperiment/config/phpcount.config.php
rename to homepage/config/phpcount.config.php
diff --git a/homepage/cwsvJudo/.gitignore b/homepage/cwsvJudo/.gitignore
new file mode 100644
index 0000000..5ba50b7
--- /dev/null
+++ b/homepage/cwsvJudo/.gitignore
@@ -0,0 +1,2 @@
+build/*
+temp/*
diff --git a/homepage/redesign2018/markdownExperiment/.htaccess b/homepage/cwsvJudo/.htaccess
similarity index 100%
rename from homepage/redesign2018/markdownExperiment/.htaccess
rename to homepage/cwsvJudo/.htaccess
diff --git a/homepage/redesign2018/markdownExperiment/.htaccess-phpAppender b/homepage/cwsvJudo/.htaccess-phpAppender
similarity index 100%
rename from homepage/redesign2018/markdownExperiment/.htaccess-phpAppender
rename to homepage/cwsvJudo/.htaccess-phpAppender
diff --git a/homepage/redesign2018/markdownExperiment/Makefile b/homepage/cwsvJudo/Makefile
similarity index 100%
rename from homepage/redesign2018/markdownExperiment/Makefile
rename to homepage/cwsvJudo/Makefile
diff --git a/homepage/redesign2018/markdownExperiment/admin/.htaccess b/homepage/cwsvJudo/admin/.htaccess
similarity index 100%
rename from homepage/redesign2018/markdownExperiment/admin/.htaccess
rename to homepage/cwsvJudo/admin/.htaccess
diff --git a/homepage/redesign2018/markdownExperiment/admin/.htgroups b/homepage/cwsvJudo/admin/.htgroups
similarity index 100%
rename from homepage/redesign2018/markdownExperiment/admin/.htgroups
rename to homepage/cwsvJudo/admin/.htgroups
diff --git a/homepage/redesign2018/markdownExperiment/admin/.htusers b/homepage/cwsvJudo/admin/.htusers
similarity index 100%
rename from homepage/redesign2018/markdownExperiment/admin/.htusers
rename to homepage/cwsvJudo/admin/.htusers
diff --git a/homepage/redesign2018/markdownExperiment/admin/ak2jg.php b/homepage/cwsvJudo/admin/ak2jg.php
similarity index 100%
rename from homepage/redesign2018/markdownExperiment/admin/ak2jg.php
rename to homepage/cwsvJudo/admin/ak2jg.php
diff --git a/homepage/redesign2018/markdownExperiment/admin/config.inc.php b/homepage/cwsvJudo/admin/config.inc.php
similarity index 100%
rename from homepage/redesign2018/markdownExperiment/admin/config.inc.php
rename to homepage/cwsvJudo/admin/config.inc.php
diff --git a/homepage/redesign2018/markdownExperiment/admin/mdDisplayer/index.php b/homepage/cwsvJudo/admin/mdDisplayer/index.php
similarity index 100%
rename from homepage/redesign2018/markdownExperiment/admin/mdDisplayer/index.php
rename to homepage/cwsvJudo/admin/mdDisplayer/index.php
diff --git a/homepage/redesign2018/markdownExperiment/admin/newsAdmin.php b/homepage/cwsvJudo/admin/newsAdmin.php
similarity index 100%
rename from homepage/redesign2018/markdownExperiment/admin/newsAdmin.php
rename to homepage/cwsvJudo/admin/newsAdmin.php
diff --git a/homepage/redesign2018/markdownExperiment/admin/newsAmpTest.php b/homepage/cwsvJudo/admin/newsAmpTest.php
similarity index 100%
rename from homepage/redesign2018/markdownExperiment/admin/newsAmpTest.php
rename to homepage/cwsvJudo/admin/newsAmpTest.php
diff --git a/homepage/redesign2018/markdownExperiment/admin/newsLib.php.inc b/homepage/cwsvJudo/admin/newsLib.php.inc
similarity index 100%
rename from homepage/redesign2018/markdownExperiment/admin/newsLib.php.inc
rename to homepage/cwsvJudo/admin/newsLib.php.inc
diff --git a/homepage/redesign2018/markdownExperiment/admin/newsTest.php b/homepage/cwsvJudo/admin/newsTest.php
similarity index 100%
rename from homepage/redesign2018/markdownExperiment/admin/newsTest.php
rename to homepage/cwsvJudo/admin/newsTest.php
diff --git a/homepage/redesign2018/markdownExperiment/admin/phpcount/phpcountLog.php b/homepage/cwsvJudo/admin/phpcount/phpcountLog.php
similarity index 100%
rename from homepage/redesign2018/markdownExperiment/admin/phpcount/phpcountLog.php
rename to homepage/cwsvJudo/admin/phpcount/phpcountLog.php
diff --git a/homepage/redesign2018/markdownExperiment/admin/phpcount/visitorCount.phplot.php b/homepage/cwsvJudo/admin/phpcount/visitorCount.phplot.php
similarity index 100%
rename from homepage/redesign2018/markdownExperiment/admin/phpcount/visitorCount.phplot.php
rename to homepage/cwsvJudo/admin/phpcount/visitorCount.phplot.php
diff --git a/homepage/redesign2018/markdownExperiment/admin/redirecter/redirectLog.php b/homepage/cwsvJudo/admin/redirecter/redirectLog.php
similarity index 100%
rename from homepage/redesign2018/markdownExperiment/admin/redirecter/redirectLog.php
rename to homepage/cwsvJudo/admin/redirecter/redirectLog.php
diff --git a/homepage/redesign2018/markdownExperiment/backup/ampPages-backup-2018-06-11-06-49/.htaccess b/homepage/cwsvJudo/backup/ampPages-backup-2018-06-11-06-49/.htaccess
similarity index 100%
rename from homepage/redesign2018/markdownExperiment/backup/ampPages-backup-2018-06-11-06-49/.htaccess
rename to homepage/cwsvJudo/backup/ampPages-backup-2018-06-11-06-49/.htaccess
diff --git a/homepage/redesign2018/markdownExperiment/backup/ampPages-backup-2018-06-11-06-49/config.inc.php b/homepage/cwsvJudo/backup/ampPages-backup-2018-06-11-06-49/config.inc.php
similarity index 100%
rename from homepage/redesign2018/markdownExperiment/backup/ampPages-backup-2018-06-11-06-49/config.inc.php
rename to homepage/cwsvJudo/backup/ampPages-backup-2018-06-11-06-49/config.inc.php
diff --git a/homepage/redesign2018/markdownExperiment/backup/ampPages-backup-2018-06-11-06-49/css/cwsvJudoAmp.css b/homepage/cwsvJudo/backup/ampPages-backup-2018-06-11-06-49/css/cwsvJudoAmp.css
similarity index 100%
rename from homepage/redesign2018/markdownExperiment/backup/ampPages-backup-2018-06-11-06-49/css/cwsvJudoAmp.css
rename to homepage/cwsvJudo/backup/ampPages-backup-2018-06-11-06-49/css/cwsvJudoAmp.css
diff --git a/homepage/redesign2018/markdownExperiment/backup/ampPages-backup-2018-06-11-06-49/cwsvJudo.ampTemplate.inc.php b/homepage/cwsvJudo/backup/ampPages-backup-2018-06-11-06-49/cwsvJudo.ampTemplate.inc.php
similarity index 100%
rename from homepage/redesign2018/markdownExperiment/backup/ampPages-backup-2018-06-11-06-49/cwsvJudo.ampTemplate.inc.php
rename to homepage/cwsvJudo/backup/ampPages-backup-2018-06-11-06-49/cwsvJudo.ampTemplate.inc.php
diff --git a/homepage/redesign2018/markdownExperiment/backup/ampPages-backup-2018-06-11-06-49/expCounter/counter.php b/homepage/cwsvJudo/backup/ampPages-backup-2018-06-11-06-49/expCounter/counter.php
similarity index 100%
rename from homepage/redesign2018/markdownExperiment/backup/ampPages-backup-2018-06-11-06-49/expCounter/counter.php
rename to homepage/cwsvJudo/backup/ampPages-backup-2018-06-11-06-49/expCounter/counter.php
diff --git a/homepage/redesign2018/markdownExperiment/backup/ampPages-backup-2018-06-11-06-49/galerien.php b/homepage/cwsvJudo/backup/ampPages-backup-2018-06-11-06-49/galerien.php
similarity index 100%
rename from homepage/redesign2018/markdownExperiment/backup/ampPages-backup-2018-06-11-06-49/galerien.php
rename to homepage/cwsvJudo/backup/ampPages-backup-2018-06-11-06-49/galerien.php
diff --git a/homepage/redesign2018/markdownExperiment/backup/ampPages-backup-2018-06-11-06-49/googlef3ad27a876479282.html b/homepage/cwsvJudo/backup/ampPages-backup-2018-06-11-06-49/googlef3ad27a876479282.html
similarity index 100%
rename from homepage/redesign2018/markdownExperiment/backup/ampPages-backup-2018-06-11-06-49/googlef3ad27a876479282.html
rename to homepage/cwsvJudo/backup/ampPages-backup-2018-06-11-06-49/googlef3ad27a876479282.html
diff --git a/homepage/redesign2018/markdownExperiment/backup/ampPages-backup-2018-06-11-06-49/index.php b/homepage/cwsvJudo/backup/ampPages-backup-2018-06-11-06-49/index.php
similarity index 100%
rename from homepage/redesign2018/markdownExperiment/backup/ampPages-backup-2018-06-11-06-49/index.php
rename to homepage/cwsvJudo/backup/ampPages-backup-2018-06-11-06-49/index.php
diff --git a/homepage/redesign2018/markdownExperiment/backup/ampPages-backup-2018-06-11-06-49/kontakt.php b/homepage/cwsvJudo/backup/ampPages-backup-2018-06-11-06-49/kontakt.php
similarity index 100%
rename from homepage/redesign2018/markdownExperiment/backup/ampPages-backup-2018-06-11-06-49/kontakt.php
rename to homepage/cwsvJudo/backup/ampPages-backup-2018-06-11-06-49/kontakt.php
diff --git a/homepage/redesign2018/markdownExperiment/backup/ampPages-backup-2018-06-11-06-49/news.php b/homepage/cwsvJudo/backup/ampPages-backup-2018-06-11-06-49/news.php
similarity index 100%
rename from homepage/redesign2018/markdownExperiment/backup/ampPages-backup-2018-06-11-06-49/news.php
rename to homepage/cwsvJudo/backup/ampPages-backup-2018-06-11-06-49/news.php
diff --git a/homepage/redesign2018/markdownExperiment/backup/ampPages-backup-2018-06-11-06-49/newsDev.php b/homepage/cwsvJudo/backup/ampPages-backup-2018-06-11-06-49/newsDev.php
similarity index 100%
rename from homepage/redesign2018/markdownExperiment/backup/ampPages-backup-2018-06-11-06-49/newsDev.php
rename to homepage/cwsvJudo/backup/ampPages-backup-2018-06-11-06-49/newsDev.php
diff --git a/homepage/redesign2018/markdownExperiment/backup/ampPages-backup-2018-06-11-06-49/pages/desktop/verein.galerien.php b/homepage/cwsvJudo/backup/ampPages-backup-2018-06-11-06-49/pages/desktop/verein.galerien.php
similarity index 100%
rename from homepage/redesign2018/markdownExperiment/backup/ampPages-backup-2018-06-11-06-49/pages/desktop/verein.galerien.php
rename to homepage/cwsvJudo/backup/ampPages-backup-2018-06-11-06-49/pages/desktop/verein.galerien.php
diff --git a/homepage/redesign2018/markdownExperiment/backup/ampPages-backup-2018-06-11-06-49/phpLib/ampify.php b/homepage/cwsvJudo/backup/ampPages-backup-2018-06-11-06-49/phpLib/ampify.php
similarity index 100%
rename from homepage/redesign2018/markdownExperiment/backup/ampPages-backup-2018-06-11-06-49/phpLib/ampify.php
rename to homepage/cwsvJudo/backup/ampPages-backup-2018-06-11-06-49/phpLib/ampify.php
diff --git a/homepage/redesign2018/markdownExperiment/backup/ampPages-backup-2018-06-11-06-49/phpLib/cwsvJudoAmpLib.php b/homepage/cwsvJudo/backup/ampPages-backup-2018-06-11-06-49/phpLib/cwsvJudoAmpLib.php
similarity index 100%
rename from homepage/redesign2018/markdownExperiment/backup/ampPages-backup-2018-06-11-06-49/phpLib/cwsvJudoAmpLib.php
rename to homepage/cwsvJudo/backup/ampPages-backup-2018-06-11-06-49/phpLib/cwsvJudoAmpLib.php
diff --git a/homepage/redesign2018/markdownExperiment/backup/ampPages-backup-2018-06-11-06-49/robots.txt b/homepage/cwsvJudo/backup/ampPages-backup-2018-06-11-06-49/robots.txt
similarity index 100%
rename from homepage/redesign2018/markdownExperiment/backup/ampPages-backup-2018-06-11-06-49/robots.txt
rename to homepage/cwsvJudo/backup/ampPages-backup-2018-06-11-06-49/robots.txt
diff --git a/homepage/redesign2018/markdownExperiment/backup/ampPages-backup-2018-06-11-06-49/sitemap.xml b/homepage/cwsvJudo/backup/ampPages-backup-2018-06-11-06-49/sitemap.xml
similarity index 100%
rename from homepage/redesign2018/markdownExperiment/backup/ampPages-backup-2018-06-11-06-49/sitemap.xml
rename to homepage/cwsvJudo/backup/ampPages-backup-2018-06-11-06-49/sitemap.xml
diff --git a/homepage/redesign2018/markdownExperiment/backup/ampPages-backup-2018-06-11-06-49/trainingszeiten.php b/homepage/cwsvJudo/backup/ampPages-backup-2018-06-11-06-49/trainingszeiten.php
similarity index 100%
rename from homepage/redesign2018/markdownExperiment/backup/ampPages-backup-2018-06-11-06-49/trainingszeiten.php
rename to homepage/cwsvJudo/backup/ampPages-backup-2018-06-11-06-49/trainingszeiten.php
diff --git a/homepage/redesign2018/markdownExperiment/backup/ampPages-backup-2018-06-11-06-49/urllist.txt b/homepage/cwsvJudo/backup/ampPages-backup-2018-06-11-06-49/urllist.txt
similarity index 100%
rename from homepage/redesign2018/markdownExperiment/backup/ampPages-backup-2018-06-11-06-49/urllist.txt
rename to homepage/cwsvJudo/backup/ampPages-backup-2018-06-11-06-49/urllist.txt
diff --git a/homepage/redesign2018/markdownExperiment/backup/ampPages-backup-2018-06-11-06-49/verein.training.php b/homepage/cwsvJudo/backup/ampPages-backup-2018-06-11-06-49/verein.training.php
similarity index 100%
rename from homepage/redesign2018/markdownExperiment/backup/ampPages-backup-2018-06-11-06-49/verein.training.php
rename to homepage/cwsvJudo/backup/ampPages-backup-2018-06-11-06-49/verein.training.php
diff --git a/homepage/redesign2018/markdownExperiment/backup/config.inc.php b/homepage/cwsvJudo/backup/config.inc.php
similarity index 100%
rename from homepage/redesign2018/markdownExperiment/backup/config.inc.php
rename to homepage/cwsvJudo/backup/config.inc.php
diff --git a/homepage/redesign2018/markdownExperiment/backup/news.php b/homepage/cwsvJudo/backup/news.php
similarity index 100%
rename from homepage/redesign2018/markdownExperiment/backup/news.php
rename to homepage/cwsvJudo/backup/news.php
diff --git a/homepage/redesign2018/markdownExperiment/backup/newsLib.php b/homepage/cwsvJudo/backup/newsLib.php
similarity index 100%
rename from homepage/redesign2018/markdownExperiment/backup/newsLib.php
rename to homepage/cwsvJudo/backup/newsLib.php
diff --git a/homepage/redesign2018/markdownExperiment/backup/newsTableHtml.php b/homepage/cwsvJudo/backup/newsTableHtml.php
similarity index 100%
rename from homepage/redesign2018/markdownExperiment/backup/newsTableHtml.php
rename to homepage/cwsvJudo/backup/newsTableHtml.php
diff --git a/homepage/redesign2018/markdownExperiment/backup/pagesMobile/.htacces b/homepage/cwsvJudo/backup/pagesMobile/.htacces
similarity index 100%
rename from homepage/redesign2018/markdownExperiment/backup/pagesMobile/.htacces
rename to homepage/cwsvJudo/backup/pagesMobile/.htacces
diff --git a/homepage/redesign2018/markdownExperiment/backup/pagesMobile/amimobile.php b/homepage/cwsvJudo/backup/pagesMobile/amimobile.php
similarity index 100%
rename from homepage/redesign2018/markdownExperiment/backup/pagesMobile/amimobile.php
rename to homepage/cwsvJudo/backup/pagesMobile/amimobile.php
diff --git a/homepage/redesign2018/markdownExperiment/backup/pagesMobile/doc/detectmobilebrowser.php b/homepage/cwsvJudo/backup/pagesMobile/doc/detectmobilebrowser.php
similarity index 100%
rename from homepage/redesign2018/markdownExperiment/backup/pagesMobile/doc/detectmobilebrowser.php
rename to homepage/cwsvJudo/backup/pagesMobile/doc/detectmobilebrowser.php
diff --git a/homepage/redesign2018/markdownExperiment/backup/pagesMobile/doc/heise.mobile.css b/homepage/cwsvJudo/backup/pagesMobile/doc/heise.mobile.css
similarity index 100%
rename from homepage/redesign2018/markdownExperiment/backup/pagesMobile/doc/heise.mobile.css
rename to homepage/cwsvJudo/backup/pagesMobile/doc/heise.mobile.css
diff --git a/homepage/redesign2018/markdownExperiment/backup/pagesMobile/doc/is_mobile.php b/homepage/cwsvJudo/backup/pagesMobile/doc/is_mobile.php
similarity index 100%
rename from homepage/redesign2018/markdownExperiment/backup/pagesMobile/doc/is_mobile.php
rename to homepage/cwsvJudo/backup/pagesMobile/doc/is_mobile.php
diff --git a/homepage/redesign2018/markdownExperiment/backup/pagesMobile/index.php b/homepage/cwsvJudo/backup/pagesMobile/index.php
similarity index 100%
rename from homepage/redesign2018/markdownExperiment/backup/pagesMobile/index.php
rename to homepage/cwsvJudo/backup/pagesMobile/index.php
diff --git a/homepage/redesign2018/markdownExperiment/backup/pagesMobile/index.test.php b/homepage/cwsvJudo/backup/pagesMobile/index.test.php
similarity index 100%
rename from homepage/redesign2018/markdownExperiment/backup/pagesMobile/index.test.php
rename to homepage/cwsvJudo/backup/pagesMobile/index.test.php
diff --git a/homepage/redesign2018/markdownExperiment/backup/pagesMobile/layout.css b/homepage/cwsvJudo/backup/pagesMobile/layout.css
similarity index 100%
rename from homepage/redesign2018/markdownExperiment/backup/pagesMobile/layout.css
rename to homepage/cwsvJudo/backup/pagesMobile/layout.css
diff --git a/homepage/redesign2018/markdownExperiment/backup/pagesMobile/mobile.blanko.php b/homepage/cwsvJudo/backup/pagesMobile/mobile.blanko.php
similarity index 100%
rename from homepage/redesign2018/markdownExperiment/backup/pagesMobile/mobile.blanko.php
rename to homepage/cwsvJudo/backup/pagesMobile/mobile.blanko.php
diff --git a/homepage/redesign2018/markdownExperiment/backup/pagesMobile/phplib/is_mobile.php b/homepage/cwsvJudo/backup/pagesMobile/phplib/is_mobile.php
similarity index 100%
rename from homepage/redesign2018/markdownExperiment/backup/pagesMobile/phplib/is_mobile.php
rename to homepage/cwsvJudo/backup/pagesMobile/phplib/is_mobile.php
diff --git a/homepage/redesign2018/markdownExperiment/backup/pagesMobile/verein.news.php b/homepage/cwsvJudo/backup/pagesMobile/verein.news.php
similarity index 100%
rename from homepage/redesign2018/markdownExperiment/backup/pagesMobile/verein.news.php
rename to homepage/cwsvJudo/backup/pagesMobile/verein.news.php
diff --git a/homepage/redesign2018/markdownExperiment/backup/pagesMobile/verein.trainingszeiten.php b/homepage/cwsvJudo/backup/pagesMobile/verein.trainingszeiten.php
similarity index 100%
rename from homepage/redesign2018/markdownExperiment/backup/pagesMobile/verein.trainingszeiten.php
rename to homepage/cwsvJudo/backup/pagesMobile/verein.trainingszeiten.php
diff --git a/homepage/redesign2018/markdownExperiment/backup/pagesMobile/verein.wettkampfgalerien.php b/homepage/cwsvJudo/backup/pagesMobile/verein.wettkampfgalerien.php
similarity index 100%
rename from homepage/redesign2018/markdownExperiment/backup/pagesMobile/verein.wettkampfgalerien.php
rename to homepage/cwsvJudo/backup/pagesMobile/verein.wettkampfgalerien.php
diff --git a/homepage/redesign2018/markdownExperiment/backup/pagesMobile/verein.wettkampfkalender.2012.php b/homepage/cwsvJudo/backup/pagesMobile/verein.wettkampfkalender.2012.php
similarity index 100%
rename from homepage/redesign2018/markdownExperiment/backup/pagesMobile/verein.wettkampfkalender.2012.php
rename to homepage/cwsvJudo/backup/pagesMobile/verein.wettkampfkalender.2012.php
diff --git a/homepage/redesign2018/markdownExperiment/backup/pagesMobile/verein.wettkampfkalender.php b/homepage/cwsvJudo/backup/pagesMobile/verein.wettkampfkalender.php
similarity index 100%
rename from homepage/redesign2018/markdownExperiment/backup/pagesMobile/verein.wettkampfkalender.php
rename to homepage/cwsvJudo/backup/pagesMobile/verein.wettkampfkalender.php
diff --git a/homepage/redesign2018/markdownExperiment/config.inc.php b/homepage/cwsvJudo/config.inc.php
similarity index 100%
rename from homepage/redesign2018/markdownExperiment/config.inc.php
rename to homepage/cwsvJudo/config.inc.php
diff --git a/homepage/cwsvJudo/config/.htaccess b/homepage/cwsvJudo/config/.htaccess
new file mode 100644
index 0000000..2a42bfb
--- /dev/null
+++ b/homepage/cwsvJudo/config/.htaccess
@@ -0,0 +1,3 @@
+order deny,allow
+deny from all
+allow from localhost
diff --git a/homepage/redesign2018/markdownExperiment/config/cwsvJudo.config.php b/homepage/cwsvJudo/config/cwsvJudo.config.php
similarity index 100%
rename from homepage/redesign2018/markdownExperiment/config/cwsvJudo.config.php
rename to homepage/cwsvJudo/config/cwsvJudo.config.php
diff --git a/homepage/redesign2018/markdownExperiment/config/db.inc b/homepage/cwsvJudo/config/db.inc
similarity index 100%
rename from homepage/redesign2018/markdownExperiment/config/db.inc
rename to homepage/cwsvJudo/config/db.inc
diff --git a/homepage/cwsvJudo/config/phpcount.config.php b/homepage/cwsvJudo/config/phpcount.config.php
new file mode 100644
index 0000000..35ce128
--- /dev/null
+++ b/homepage/cwsvJudo/config/phpcount.config.php
@@ -0,0 +1,10 @@
+<?php
+$phpcountConfig["db"]["host"]     = "localhost";
+$phpcountConfig["db"]["name"]     = "cwsvjudo";
+$phpcountConfig["db"]["user"]     = "cwsvjudo";
+$phpcountConfig["db"]["password"] = "***REMOVED***";
+
+$phpcountConfig["db"]["hitsTable"]     = "phpcount_hits";
+$phpcountConfig["db"]["nodupesTable"]  = "phpcount_nodupes";
+$phpcountConfig["db"]["pagehitsTable"] = "phpcount_pageHits";
+?>
diff --git a/homepage/redesign2018/markdownExperiment/cwsvJudo-2018.css b/homepage/cwsvJudo/cwsvJudo-2018.css
similarity index 100%
rename from homepage/redesign2018/markdownExperiment/cwsvJudo-2018.css
rename to homepage/cwsvJudo/cwsvJudo-2018.css
diff --git a/homepage/redesign2018/markdownExperiment/cwsvjudo.sql b/homepage/cwsvJudo/cwsvjudo.sql
similarity index 100%
rename from homepage/redesign2018/markdownExperiment/cwsvjudo.sql
rename to homepage/cwsvJudo/cwsvjudo.sql
diff --git a/homepage/redesign2018/markdownExperiment/desktop.verein.wettkampfkalender.php b/homepage/cwsvJudo/desktop.verein.wettkampfkalender.php
similarity index 100%
rename from homepage/redesign2018/markdownExperiment/desktop.verein.wettkampfkalender.php
rename to homepage/cwsvJudo/desktop.verein.wettkampfkalender.php
diff --git a/homepage/redesign2018/markdownExperiment/desktop2018.verein.wettkampfkalender.php b/homepage/cwsvJudo/desktop2018.verein.wettkampfkalender.php
similarity index 100%
rename from homepage/redesign2018/markdownExperiment/desktop2018.verein.wettkampfkalender.php
rename to homepage/cwsvJudo/desktop2018.verein.wettkampfkalender.php
diff --git a/homepage/redesign2018/markdownExperiment/graphiken/cwsvJudoLogoWappen.x256.png b/homepage/cwsvJudo/graphiken/cwsvJudoLogoWappen.x256.png
similarity index 100%
rename from homepage/redesign2018/markdownExperiment/graphiken/cwsvJudoLogoWappen.x256.png
rename to homepage/cwsvJudo/graphiken/cwsvJudoLogoWappen.x256.png
diff --git a/homepage/redesign2018/markdownExperiment/graphiken/cwsvJudoLogoWappen.xcf b/homepage/cwsvJudo/graphiken/cwsvJudoLogoWappen.xcf
similarity index 100%
rename from homepage/redesign2018/markdownExperiment/graphiken/cwsvJudoLogoWappen.xcf
rename to homepage/cwsvJudo/graphiken/cwsvJudoLogoWappen.xcf
diff --git a/homepage/redesign2018/markdownExperiment/graphiken/cwsvLogoWappen.x250.png b/homepage/cwsvJudo/graphiken/cwsvLogoWappen.x250.png
similarity index 100%
rename from homepage/redesign2018/markdownExperiment/graphiken/cwsvLogoWappen.x250.png
rename to homepage/cwsvJudo/graphiken/cwsvLogoWappen.x250.png
diff --git a/homepage/redesign2018/markdownExperiment/graphiken/cwsvLogoWappen.xcf b/homepage/cwsvJudo/graphiken/cwsvLogoWappen.xcf
similarity index 100%
rename from homepage/redesign2018/markdownExperiment/graphiken/cwsvLogoWappen.xcf
rename to homepage/cwsvJudo/graphiken/cwsvLogoWappen.xcf
diff --git a/homepage/redesign2018/graphiken/icons/13550941824577 (1).svg b/homepage/cwsvJudo/graphiken/icons/13550941824577 (1).svg
similarity index 100%
rename from homepage/redesign2018/graphiken/icons/13550941824577 (1).svg
rename to homepage/cwsvJudo/graphiken/icons/13550941824577 (1).svg
diff --git a/homepage/redesign2018/markdownExperiment/graphiken/icons/HTML5_1Color_Black.svg b/homepage/cwsvJudo/graphiken/icons/HTML5_1Color_Black.svg
similarity index 100%
rename from homepage/redesign2018/markdownExperiment/graphiken/icons/HTML5_1Color_Black.svg
rename to homepage/cwsvJudo/graphiken/icons/HTML5_1Color_Black.svg
diff --git a/homepage/redesign2018/graphiken/icons/arrow-156117.svg b/homepage/cwsvJudo/graphiken/icons/arrow-156117.svg
similarity index 100%
rename from homepage/redesign2018/graphiken/icons/arrow-156117.svg
rename to homepage/cwsvJudo/graphiken/icons/arrow-156117.svg
diff --git a/homepage/redesign2018/graphiken/icons/arrow-156117.svg.png b/homepage/cwsvJudo/graphiken/icons/arrow-156117.svg.png
similarity index 100%
rename from homepage/redesign2018/graphiken/icons/arrow-156117.svg.png
rename to homepage/cwsvJudo/graphiken/icons/arrow-156117.svg.png
diff --git a/homepage/redesign2018/graphiken/icons/arrow-25841.svg.png b/homepage/cwsvJudo/graphiken/icons/arrow-25841.svg.png
similarity index 100%
rename from homepage/redesign2018/graphiken/icons/arrow-25841.svg.png
rename to homepage/cwsvJudo/graphiken/icons/arrow-25841.svg.png
diff --git a/homepage/redesign2018/graphiken/icons/arrow-25853.svg b/homepage/cwsvJudo/graphiken/icons/arrow-25853.svg
similarity index 100%
rename from homepage/redesign2018/graphiken/icons/arrow-25853.svg
rename to homepage/cwsvJudo/graphiken/icons/arrow-25853.svg
diff --git a/homepage/redesign2018/graphiken/icons/arrow-25853.svg.png b/homepage/cwsvJudo/graphiken/icons/arrow-25853.svg.png
similarity index 100%
rename from homepage/redesign2018/graphiken/icons/arrow-25853.svg.png
rename to homepage/cwsvJudo/graphiken/icons/arrow-25853.svg.png
diff --git a/homepage/redesign2018/graphiken/icons/arrow-44008.svg b/homepage/cwsvJudo/graphiken/icons/arrow-44008.svg
similarity index 100%
rename from homepage/redesign2018/graphiken/icons/arrow-44008.svg
rename to homepage/cwsvJudo/graphiken/icons/arrow-44008.svg
diff --git a/homepage/redesign2018/graphiken/icons/arrow-44008.svg.png b/homepage/cwsvJudo/graphiken/icons/arrow-44008.svg.png
similarity index 100%
rename from homepage/redesign2018/graphiken/icons/arrow-44008.svg.png
rename to homepage/cwsvJudo/graphiken/icons/arrow-44008.svg.png
diff --git a/homepage/redesign2018/markdownExperiment/graphiken/icons/arrowRightDown.svg b/homepage/cwsvJudo/graphiken/icons/arrowRightDown.svg
similarity index 100%
rename from homepage/redesign2018/markdownExperiment/graphiken/icons/arrowRightDown.svg
rename to homepage/cwsvJudo/graphiken/icons/arrowRightDown.svg
diff --git a/homepage/redesign2018/graphiken/icons/button-24803.svg b/homepage/cwsvJudo/graphiken/icons/button-24803.svg
similarity index 100%
rename from homepage/redesign2018/graphiken/icons/button-24803.svg
rename to homepage/cwsvJudo/graphiken/icons/button-24803.svg
diff --git a/homepage/redesign2018/graphiken/icons/button-24803.svg.png b/homepage/cwsvJudo/graphiken/icons/button-24803.svg.png
similarity index 100%
rename from homepage/redesign2018/graphiken/icons/button-24803.svg.png
rename to homepage/cwsvJudo/graphiken/icons/button-24803.svg.png
diff --git a/homepage/redesign2018/markdownExperiment/graphiken/icons/calendarIcon.svg b/homepage/cwsvJudo/graphiken/icons/calendarIcon.svg
similarity index 100%
rename from homepage/redesign2018/markdownExperiment/graphiken/icons/calendarIcon.svg
rename to homepage/cwsvJudo/graphiken/icons/calendarIcon.svg
diff --git a/homepage/redesign2018/markdownExperiment/graphiken/icons/clockIconFriendly.svg b/homepage/cwsvJudo/graphiken/icons/clockIconFriendly.svg
similarity index 100%
rename from homepage/redesign2018/markdownExperiment/graphiken/icons/clockIconFriendly.svg
rename to homepage/cwsvJudo/graphiken/icons/clockIconFriendly.svg
diff --git a/homepage/redesign2018/markdownExperiment/graphiken/icons/contact4Ways.svg b/homepage/cwsvJudo/graphiken/icons/contact4Ways.svg
similarity index 100%
rename from homepage/redesign2018/markdownExperiment/graphiken/icons/contact4Ways.svg
rename to homepage/cwsvJudo/graphiken/icons/contact4Ways.svg
diff --git a/homepage/redesign2018/markdownExperiment/graphiken/icons/cwsv.ico b/homepage/cwsvJudo/graphiken/icons/cwsv.ico
similarity index 100%
rename from homepage/redesign2018/markdownExperiment/graphiken/icons/cwsv.ico
rename to homepage/cwsvJudo/graphiken/icons/cwsv.ico
diff --git a/homepage/redesign2018/graphiken/icons/down-29013.svg b/homepage/cwsvJudo/graphiken/icons/down-29013.svg
similarity index 100%
rename from homepage/redesign2018/graphiken/icons/down-29013.svg
rename to homepage/cwsvJudo/graphiken/icons/down-29013.svg
diff --git a/homepage/redesign2018/graphiken/icons/down-29013.svg.png b/homepage/cwsvJudo/graphiken/icons/down-29013.svg.png
similarity index 100%
rename from homepage/redesign2018/graphiken/icons/down-29013.svg.png
rename to homepage/cwsvJudo/graphiken/icons/down-29013.svg.png
diff --git a/homepage/redesign2018/graphiken/icons/download-154367.svg b/homepage/cwsvJudo/graphiken/icons/download-154367.svg
similarity index 100%
rename from homepage/redesign2018/graphiken/icons/download-154367.svg
rename to homepage/cwsvJudo/graphiken/icons/download-154367.svg
diff --git a/homepage/redesign2018/graphiken/icons/download-154367.svg.png b/homepage/cwsvJudo/graphiken/icons/download-154367.svg.png
similarity index 100%
rename from homepage/redesign2018/graphiken/icons/download-154367.svg.png
rename to homepage/cwsvJudo/graphiken/icons/download-154367.svg.png
diff --git a/homepage/redesign2018/graphiken/icons/downloadIcon.svg b/homepage/cwsvJudo/graphiken/icons/downloadIcon.svg
similarity index 100%
rename from homepage/redesign2018/graphiken/icons/downloadIcon.svg
rename to homepage/cwsvJudo/graphiken/icons/downloadIcon.svg
diff --git a/homepage/redesign2018/markdownExperiment/graphiken/icons/filmrolle-grau.svg b/homepage/cwsvJudo/graphiken/icons/filmrolle-grau.svg
similarity index 100%
rename from homepage/redesign2018/markdownExperiment/graphiken/icons/filmrolle-grau.svg
rename to homepage/cwsvJudo/graphiken/icons/filmrolle-grau.svg
diff --git a/homepage/redesign2018/markdownExperiment/graphiken/icons/gallery.svg b/homepage/cwsvJudo/graphiken/icons/gallery.svg
similarity index 100%
rename from homepage/redesign2018/markdownExperiment/graphiken/icons/gallery.svg
rename to homepage/cwsvJudo/graphiken/icons/gallery.svg
diff --git a/homepage/redesign2018/graphiken/icons/icon-157360.svg b/homepage/cwsvJudo/graphiken/icons/icon-157360.svg
similarity index 100%
rename from homepage/redesign2018/graphiken/icons/icon-157360.svg
rename to homepage/cwsvJudo/graphiken/icons/icon-157360.svg
diff --git a/homepage/redesign2018/graphiken/icons/icon-157360.svg.png b/homepage/cwsvJudo/graphiken/icons/icon-157360.svg.png
similarity index 100%
rename from homepage/redesign2018/graphiken/icons/icon-157360.svg.png
rename to homepage/cwsvJudo/graphiken/icons/icon-157360.svg.png
diff --git a/homepage/redesign2018/graphiken/icons/icon-pack-2129743-downloadIcons.svg b/homepage/cwsvJudo/graphiken/icons/icon-pack-2129743-downloadIcons.svg
similarity index 100%
rename from homepage/redesign2018/graphiken/icons/icon-pack-2129743-downloadIcons.svg
rename to homepage/cwsvJudo/graphiken/icons/icon-pack-2129743-downloadIcons.svg
diff --git a/homepage/redesign2018/graphiken/icons/judoSchriftzugVertikal.svg b/homepage/cwsvJudo/graphiken/icons/judoSchriftzugVertikal.svg
similarity index 100%
rename from homepage/redesign2018/graphiken/icons/judoSchriftzugVertikal.svg
rename to homepage/cwsvJudo/graphiken/icons/judoSchriftzugVertikal.svg
diff --git a/homepage/redesign2018/markdownExperiment/graphiken/icons/kamera-grau.svg b/homepage/cwsvJudo/graphiken/icons/kamera-grau.svg
similarity index 100%
rename from homepage/redesign2018/markdownExperiment/graphiken/icons/kamera-grau.svg
rename to homepage/cwsvJudo/graphiken/icons/kamera-grau.svg
diff --git a/homepage/redesign2018/graphiken/icons/linksIcon.svg b/homepage/cwsvJudo/graphiken/icons/linksIcon.svg
similarity index 100%
rename from homepage/redesign2018/graphiken/icons/linksIcon.svg
rename to homepage/cwsvJudo/graphiken/icons/linksIcon.svg
diff --git a/homepage/redesign2018/markdownExperiment/graphiken/icons/newsFeedIcon.svg b/homepage/cwsvJudo/graphiken/icons/newsFeedIcon.svg
similarity index 100%
rename from homepage/redesign2018/markdownExperiment/graphiken/icons/newsFeedIcon.svg
rename to homepage/cwsvJudo/graphiken/icons/newsFeedIcon.svg
diff --git a/homepage/redesign2018/markdownExperiment/graphiken/icons/newsIcon.svg b/homepage/cwsvJudo/graphiken/icons/newsIcon.svg
similarity index 100%
rename from homepage/redesign2018/markdownExperiment/graphiken/icons/newsIcon.svg
rename to homepage/cwsvJudo/graphiken/icons/newsIcon.svg
diff --git a/homepage/redesign2018/graphiken/icons/quizLampe.svg b/homepage/cwsvJudo/graphiken/icons/quizLampe.svg
similarity index 100%
rename from homepage/redesign2018/graphiken/icons/quizLampe.svg
rename to homepage/cwsvJudo/graphiken/icons/quizLampe.svg
diff --git a/homepage/redesign2018/graphiken/icons/record-27195.svg b/homepage/cwsvJudo/graphiken/icons/record-27195.svg
similarity index 100%
rename from homepage/redesign2018/graphiken/icons/record-27195.svg
rename to homepage/cwsvJudo/graphiken/icons/record-27195.svg
diff --git a/homepage/redesign2018/graphiken/icons/rssFeedIcon.svg b/homepage/cwsvJudo/graphiken/icons/rssFeedIcon.svg
similarity index 100%
rename from homepage/redesign2018/graphiken/icons/rssFeedIcon.svg
rename to homepage/cwsvJudo/graphiken/icons/rssFeedIcon.svg
diff --git a/homepage/redesign2018/markdownExperiment/graphiken/icons/star.svg b/homepage/cwsvJudo/graphiken/icons/star.svg
similarity index 100%
rename from homepage/redesign2018/markdownExperiment/graphiken/icons/star.svg
rename to homepage/cwsvJudo/graphiken/icons/star.svg
diff --git a/homepage/redesign2018/markdownExperiment/graphiken/icons/terminKalender.svg b/homepage/cwsvJudo/graphiken/icons/terminKalender.svg
similarity index 100%
rename from homepage/redesign2018/markdownExperiment/graphiken/icons/terminKalender.svg
rename to homepage/cwsvJudo/graphiken/icons/terminKalender.svg
diff --git a/homepage/redesign2018/graphiken/icons/werkzeugIcon.svg b/homepage/cwsvJudo/graphiken/icons/werkzeugIcon.svg
similarity index 100%
rename from homepage/redesign2018/graphiken/icons/werkzeugIcon.svg
rename to homepage/cwsvJudo/graphiken/icons/werkzeugIcon.svg
diff --git a/homepage/redesign2018/markdownExperiment/graphiken/icons/wikipediaW.svg b/homepage/cwsvJudo/graphiken/icons/wikipediaW.svg
similarity index 100%
rename from homepage/redesign2018/markdownExperiment/graphiken/icons/wikipediaW.svg
rename to homepage/cwsvJudo/graphiken/icons/wikipediaW.svg
diff --git a/homepage/redesign2018/markdownExperiment/htaccess/.htaccess b/homepage/cwsvJudo/htaccess/.htaccess
similarity index 100%
rename from homepage/redesign2018/markdownExperiment/htaccess/.htaccess
rename to homepage/cwsvJudo/htaccess/.htaccess
diff --git a/homepage/redesign2018/markdownExperiment/htaccess/.htaccess-phpAppender b/homepage/cwsvJudo/htaccess/.htaccess-phpAppender
similarity index 100%
rename from homepage/redesign2018/markdownExperiment/htaccess/.htaccess-phpAppender
rename to homepage/cwsvJudo/htaccess/.htaccess-phpAppender
diff --git a/homepage/redesign2018/markdownExperiment/htaccess/cwsvjudo.bplaced.de/.htaccess b/homepage/cwsvJudo/htaccess/cwsvjudo.bplaced.de/.htaccess
similarity index 100%
rename from homepage/redesign2018/markdownExperiment/htaccess/cwsvjudo.bplaced.de/.htaccess
rename to homepage/cwsvJudo/htaccess/cwsvjudo.bplaced.de/.htaccess
diff --git a/homepage/redesign2018/markdownExperiment/htaccess/cwsvjudo.bplaced.net/.htaccess b/homepage/cwsvJudo/htaccess/cwsvjudo.bplaced.net/.htaccess
similarity index 100%
rename from homepage/redesign2018/markdownExperiment/htaccess/cwsvjudo.bplaced.net/.htaccess
rename to homepage/cwsvJudo/htaccess/cwsvjudo.bplaced.net/.htaccess
diff --git a/homepage/redesign2018/markdownExperiment/htaccess/cwsvjudo.bplaced.net/.htaccess-backup2018-08-14 b/homepage/cwsvJudo/htaccess/cwsvjudo.bplaced.net/.htaccess-backup2018-08-14
similarity index 100%
rename from homepage/redesign2018/markdownExperiment/htaccess/cwsvjudo.bplaced.net/.htaccess-backup2018-08-14
rename to homepage/cwsvJudo/htaccess/cwsvjudo.bplaced.net/.htaccess-backup2018-08-14
diff --git a/homepage/redesign2018/markdownExperiment/htaccess/cwsvjudo.bplaced.net/www/.ftpquota b/homepage/cwsvJudo/htaccess/cwsvjudo.bplaced.net/www/.ftpquota
similarity index 100%
rename from homepage/redesign2018/markdownExperiment/htaccess/cwsvjudo.bplaced.net/www/.ftpquota
rename to homepage/cwsvJudo/htaccess/cwsvjudo.bplaced.net/www/.ftpquota
diff --git a/homepage/redesign2018/markdownExperiment/htaccess/cwsvjudo.bplaced.net/www/.htaccess b/homepage/cwsvJudo/htaccess/cwsvjudo.bplaced.net/www/.htaccess
similarity index 100%
rename from homepage/redesign2018/markdownExperiment/htaccess/cwsvjudo.bplaced.net/www/.htaccess
rename to homepage/cwsvJudo/htaccess/cwsvjudo.bplaced.net/www/.htaccess
diff --git a/homepage/redesign2018/markdownExperiment/htaccess/cwsvjudo.bplaced.net/www/.htaccess-backup-2018-05-29-06-33 b/homepage/cwsvJudo/htaccess/cwsvjudo.bplaced.net/www/.htaccess-backup-2018-05-29-06-33
similarity index 100%
rename from homepage/redesign2018/markdownExperiment/htaccess/cwsvjudo.bplaced.net/www/.htaccess-backup-2018-05-29-06-33
rename to homepage/cwsvJudo/htaccess/cwsvjudo.bplaced.net/www/.htaccess-backup-2018-05-29-06-33
diff --git a/homepage/redesign2018/markdownExperiment/htaccess/cwsvjudo.bplaced.net/www/.htgroups b/homepage/cwsvJudo/htaccess/cwsvjudo.bplaced.net/www/.htgroups
similarity index 100%
rename from homepage/redesign2018/markdownExperiment/htaccess/cwsvjudo.bplaced.net/www/.htgroups
rename to homepage/cwsvJudo/htaccess/cwsvjudo.bplaced.net/www/.htgroups
diff --git a/homepage/redesign2018/markdownExperiment/htaccess/cwsvjudo.bplaced.net/www/.htusers b/homepage/cwsvJudo/htaccess/cwsvjudo.bplaced.net/www/.htusers
similarity index 100%
rename from homepage/redesign2018/markdownExperiment/htaccess/cwsvjudo.bplaced.net/www/.htusers
rename to homepage/cwsvJudo/htaccess/cwsvjudo.bplaced.net/www/.htusers
diff --git a/homepage/redesign2018/markdownExperiment/impressumsVorlagen/impressum-recht-de.html b/homepage/cwsvJudo/impressumsVorlagen/impressum-recht-de.html
similarity index 100%
rename from homepage/redesign2018/markdownExperiment/impressumsVorlagen/impressum-recht-de.html
rename to homepage/cwsvJudo/impressumsVorlagen/impressum-recht-de.html
diff --git a/homepage/redesign2018/markdownExperiment/impressumsVorlagen/impressum-recht.de b/homepage/cwsvJudo/impressumsVorlagen/impressum-recht.de
similarity index 100%
rename from homepage/redesign2018/markdownExperiment/impressumsVorlagen/impressum-recht.de
rename to homepage/cwsvJudo/impressumsVorlagen/impressum-recht.de
diff --git a/homepage/redesign2018/markdownExperiment/impressumsVorlagen/muster_impressum_vorlage_von_www_jurarat_de.txt b/homepage/cwsvJudo/impressumsVorlagen/muster_impressum_vorlage_von_www_jurarat_de.txt
similarity index 100%
rename from homepage/redesign2018/markdownExperiment/impressumsVorlagen/muster_impressum_vorlage_von_www_jurarat_de.txt
rename to homepage/cwsvJudo/impressumsVorlagen/muster_impressum_vorlage_von_www_jurarat_de.txt
diff --git a/homepage/redesign2018/markdownExperiment/impressumsVorlagen/sqr-law.de b/homepage/cwsvJudo/impressumsVorlagen/sqr-law.de
similarity index 100%
rename from homepage/redesign2018/markdownExperiment/impressumsVorlagen/sqr-law.de
rename to homepage/cwsvJudo/impressumsVorlagen/sqr-law.de
diff --git a/homepage/redesign2018/markdownExperiment/index.php b/homepage/cwsvJudo/index.php
similarity index 100%
rename from homepage/redesign2018/markdownExperiment/index.php
rename to homepage/cwsvJudo/index.php
diff --git a/homepage/redesign2018/markdownExperiment/index.yaml b/homepage/cwsvJudo/index.yaml
similarity index 100%
rename from homepage/redesign2018/markdownExperiment/index.yaml
rename to homepage/cwsvJudo/index.yaml
diff --git a/homepage/redesign2018/markdownExperiment/indexDev.html b/homepage/cwsvJudo/indexDev.html
similarity index 100%
rename from homepage/redesign2018/markdownExperiment/indexDev.html
rename to homepage/cwsvJudo/indexDev.html
diff --git a/homepage/redesign2018/markdownExperiment/kalender.php b/homepage/cwsvJudo/kalender.php
similarity index 100%
rename from homepage/redesign2018/markdownExperiment/kalender.php
rename to homepage/cwsvJudo/kalender.php
diff --git a/homepage/redesign2018/markdownExperiment/news.php b/homepage/cwsvJudo/news.php
similarity index 100%
rename from homepage/redesign2018/markdownExperiment/news.php
rename to homepage/cwsvJudo/news.php
diff --git a/homepage/redesign2018/markdownExperiment/pandocTemplate/amp-template.html b/homepage/cwsvJudo/pandocTemplate/amp-template.html
similarity index 100%
rename from homepage/redesign2018/markdownExperiment/pandocTemplate/amp-template.html
rename to homepage/cwsvJudo/pandocTemplate/amp-template.html
diff --git a/homepage/redesign2018/markdownExperiment/pandocTemplate/cwsvJudo.amp.pandocTemplate b/homepage/cwsvJudo/pandocTemplate/cwsvJudo.amp.pandocTemplate
similarity index 100%
rename from homepage/redesign2018/markdownExperiment/pandocTemplate/cwsvJudo.amp.pandocTemplate
rename to homepage/cwsvJudo/pandocTemplate/cwsvJudo.amp.pandocTemplate
diff --git a/homepage/redesign2018/markdownExperiment/pandocTemplate/cwsvJudo.amp.pandocTemplate-2018-06-12-11-36.bak b/homepage/cwsvJudo/pandocTemplate/cwsvJudo.amp.pandocTemplate~
similarity index 75%
rename from homepage/redesign2018/markdownExperiment/pandocTemplate/cwsvJudo.amp.pandocTemplate-2018-06-12-11-36.bak
rename to homepage/cwsvJudo/pandocTemplate/cwsvJudo.amp.pandocTemplate~
index f8cecd0..81307ca 100644
--- a/homepage/redesign2018/markdownExperiment/pandocTemplate/cwsvJudo.amp.pandocTemplate-2018-06-12-11-36.bak
+++ b/homepage/cwsvJudo/pandocTemplate/cwsvJudo.amp.pandocTemplate~
@@ -18,7 +18,7 @@
 	
 	galleryRedirector();
 	
-	PHPCount::AddHit("$title$");?>
+	PHPCount::AddHit("$title$ - (Amp)");?>
 <!DOCTYPE html>
 <html amp$if(lang)$ lang="$lang$"$endif$$if(dir)$ dir="$dir$"$endif$>
 	<head>
@@ -37,12 +37,13 @@ $if(description)$
 		<meta name="description" content="$description$" />
 $endif$
 $if(canonicalLink)$
-		<link rel="canonical" href="$ampVersionLink$" />
+		<link rel="canonical" href="$canonicalLink$" />
 $endif$
 $if(ampVersionLink)$
 		<link rel="amphtml" href="$ampVersionLink$" />
 $endif$
 		<title>$if(title-prefix)$$title-prefix$ – $endif$$pagetitle$</title>
+		<?php require_once($$basePath."/pages/shared/favicon.html.inc");?>
 		<style amp-custom>
 			code{white-space: pre;}
 $if(quotes)$
@@ -54,6 +55,58 @@ $endif$
 $for(css)$
 			<?php require_once($$basePath."/$css$");?>
 $endfor$
+			.home-button {
+				margin-top: 8px;
+			}
+			.headerbar {
+				  height: 50px;
+				  position: fixed;
+				  z-index: 999;
+				  top: 0;
+				  width: 100%;
+				  display: flex;
+				  align-items: center;
+			}
+			.site-name {
+				  flex: 1;
+				  margin-left: -36px;
+			}
+			article {
+				margin-top: 50px;
+			}
+			.hamburger {
+				padding-left: 10px;
+			}      
+			.sidebar {
+				padding: 10px;
+				margin: 0;
+			}
+			.sidebar > li {
+				list-style: none;
+				margin-bottom:10px;
+			}
+			.sidebar a {
+				text-decoration: none;
+			}
+			.close-sidebar {
+				font-size: 1.5em;
+				padding-left: 5px;
+			}
+			#mainNav > a > span{
+				width: 2em;
+			}
+			.newsPromoImage{
+				width: 100%;
+				max-width: 300px;
+			}
+			.messageBox{
+				width: 100%;
+				border:solid 1px #000000;
+				background-color:#FF8100;
+				font-size:smaller;
+			}
+			.fontSizeXxSmall{font-size: xx-small;}
+			.displayNone{display: none;}
 		</style>
 $if(math)$
   $math$
@@ -62,11 +115,17 @@ $for(header-includes)$
 		$header-includes$
 $endfor$
 	<script async src="https://cdn.ampproject.org/v0.js"></script>
+	<script async custom-element="amp-sidebar" src="https://cdn.ampproject.org/v0/amp-sidebar-0.1.js"></script>
 	<style amp-boilerplate>body{-webkit-animation:-amp-start 8s steps(1,end) 0s 1 normal both;-moz-animation:-amp-start 8s steps(1,end) 0s 1 normal both;-ms-animation:-amp-start 8s steps(1,end) 0s 1 normal both;animation:-amp-start 8s steps(1,end) 0s 1 normal both}@-webkit-keyframes -amp-start{from{visibility:hidden}to{visibility:visible}}@-moz-keyframes -amp-start{from{visibility:hidden}to{visibility:visible}}@-ms-keyframes -amp-start{from{visibility:hidden}to{visibility:visible}}@-o-keyframes -amp-start{from{visibility:hidden}to{visibility:visible}}@keyframes -amp-start{from{visibility:hidden}to{visibility:visible}}</style><noscript><style amp-boilerplate>body{-webkit-animation:none;-moz-animation:none;-ms-animation:none;animation:none}</style></noscript>
 	</head>
 	<body>
+	<div class="messageBox">
+		Dies ist die "mobile" Version für Smartphones etc.<br/>
+		<a href="$canonicalLink$">Hier gibt es die Desktop-Variante</a>
+	</div>
 <!-- Kopfzeile mit Titel, Promobildern und Breadcrumbs -->
 		<header class="cwsvHeader">
+			<div role="button" on="tap:sidebar1.toggle" tabindex="0" class="hamburger">☰</div>
 			<amp-img layout="responsive" 
 				width="200" height="140" 
 				title="Judo im Chemnitzer WSV" 
@@ -92,7 +151,7 @@ $if(mainNav)$
 				$if(mainNav.active)$class="activeNav" $endif$
 			>
 				$if(mainNav.icon)$
-					<span style="width:2em;"><amp-img layout="responsive" 
+					<span><amp-img layout="responsive" 
 						src="$if(mainNav.icon.src)$$mainNav.icon.src$$else$$mainNav.icon$$endif$"
 						$if(mainNav.caption)$
 							alt="$mainNav.caption$" 
@@ -123,51 +182,18 @@ $if(mainNav)$
 $endif$
 
 $if(subNav)$
-		<nav class="subNav">
+		<amp-sidebar id="sidebar1" layout="nodisplay" side="left">
+			<div role="button" aria-label="close sidebar" on="tap:sidebar1.toggle" tabindex="0" class="close-sidebar">✕</div>
+			<ul class="sidebar">
 	$for(subNav)$
-			<a href="$subNav.url$" 
-				$if(subNav.caption)$title="$subNav.caption$" $endif$
-				$if(subNav.active)$class="activeNav" $endif$
-			>
-				$if(subNav.icon)$
-					<amp-img layout="responsive" 
-						src="$if(subNav.icon.src)$$subNav.icon.src$$else$$subNav.icon$$endif$"
-						$if(subNav.caption)$
-							alt="$subNav.caption$" 
-						$else$
-							$if(subNav.icon.alt)$
-								alt="$subNav.icon.alt$"
-							$endif$
-						$endif$
-						$if(subNav.icon.width)$
-							width="$subNav.icon.width$"
-						$endif$
-						$if(subNav.icon.height)$
-							height="$subNav.icon.height$"
-						$endif$
-						$if(subNav.icon.title)$
-							title="$subNav.icon.title$"
-						$endif$
-						$if(subNav.icon.srcset)$
-							srcset="$subNav.icon.srcset$"
-						$endif$
-					></amp-img>
-				$endif$
-				$if(subNav.caption)$<span>$subNav.caption$</span>$endif$
-			</a>
+				<li>
+					<a href="$subNav.url$"
+						$if(subNav.caption)$title="$subNav.caption$" $endif$
+					>$if(subNav.caption)$$subNav.caption$$endif$</a>
+				</li>
 	$endfor$
-			<a href="#mainNav" 
-				title="Hauptnavigation"
-			>
-				<amp-img layout="responsive"
-					alt="Menü" 
-					src="http://cwsvjudo.bplaced.net/ressourcen/graphiken/icons/arrowRightDown.svg"
-					width="500" 
-					height="500" 
-				</amp-img>
-				<span>zur Hauptnavigation</span>
-			</a>
-		</nav>
+			</ul>
+		</amp-sidebar>
 $endif$
 
 $for(include-before)$
@@ -208,25 +234,13 @@ $body$
 </aside>
 
 <footer class="footerBar">
-	<a class="touchLink" 
-		title="Seite auf HTML 5 Konformität prüfen"
-		href="http://validator.w3.org/check?uri=<?php echo(urlencode(getCurPagesUrl()));?>"
-		rel="nofollow"
-	>Valid <amp-img layout="responsive" 
-		src="/ressourcen/graphiken/icons/HTML5_1Color_Black.svg"
-		alt="HTML 5"
-	></amp-img>
-	</a>
 	<a class="touchLink" title="Möglichkeiten mit dem Chemnitzer Freizeit- und Wohngebietssportverein in Kontakt zu treten" href="/kontakt" >Kontakt</a>
-	<a class="touchLink" title="Impressum" href="<?php echo($$baseUrl);?>/impressum" >Impressum</a>
-	<a class="touchLink" title="Datenschutz" href="<?php echo($$baseUrl);?>/datenschutz" >Datenschutz</a>
+	<a class="touchLink" title="Impressum" href="/impressum" >Impressum</a>
+	<a class="touchLink" title="Datenschutz" href="/datenschutz" >Datenschutz</a>
 	<a class="touchLink" 
 		title="News-Feed Abonnieren"
 		href="http://cwsvjudo.bplaced.net/rss"
-	><amp-img layout="responsive" 
-		src="/ressourcen/graphiken/icons/newsFeedIcon.svg"
-		alt="Newsfeed"
-	></amp-img>
+	>Newsfeed
 	</a>
 </footer>
 
diff --git a/homepage/redesign2018/markdownExperiment/pandocTemplate/cwsvJudo.html5.pandocTemplate b/homepage/cwsvJudo/pandocTemplate/cwsvJudo.html5.pandocTemplate
similarity index 100%
rename from homepage/redesign2018/markdownExperiment/pandocTemplate/cwsvJudo.html5.pandocTemplate
rename to homepage/cwsvJudo/pandocTemplate/cwsvJudo.html5.pandocTemplate
diff --git a/homepage/redesign2018/markdownExperiment/pandocTemplate/cwsvJudo.html5.pandocTemplate.bak b/homepage/cwsvJudo/pandocTemplate/cwsvJudo.html5.pandocTemplate~
similarity index 79%
rename from homepage/redesign2018/markdownExperiment/pandocTemplate/cwsvJudo.html5.pandocTemplate.bak
rename to homepage/cwsvJudo/pandocTemplate/cwsvJudo.html5.pandocTemplate~
index 65afd28..45e9f3a 100644
--- a/homepage/redesign2018/markdownExperiment/pandocTemplate/cwsvJudo.html5.pandocTemplate.bak
+++ b/homepage/cwsvJudo/pandocTemplate/cwsvJudo.html5.pandocTemplate~
@@ -18,11 +18,8 @@
 	
 	galleryRedirector();
 	
-$if(phpTitleString)$
-	PHPCount::AddHit($phpTitleString$);?>
-$else$
-	PHPCount::AddHit("$title$");?>
-$endif$
+	PHPCount::AddHit("$title$");
+?>
 <!DOCTYPE html>
 <html$if(lang)$ lang="$lang$"$endif$$if(dir)$ dir="$dir$"$endif$>
 	<head>
@@ -40,31 +37,13 @@ $endif$
 $if(description)$
 		<meta name="description" content="$description$" />
 $endif$
-$if(canonicalLink)$
-		<link rel="canonical" href="$canonicalLink$" />
-$endif$
 $if(ampVersionLink)$
 		<link rel="amphtml" href="$ampVersionLink$" />
 $endif$
-$if(phpTitleFunction)$
-		<title><?php $phpTitleFunction$();?></title>
-$else$
 		<title>$if(title-prefix)$$title-prefix$ – $endif$$pagetitle$</title>
-$endif$
-$if(css)$
-		<style>
-	$for(css)$
-			<?php include_once( $$basePath."/$css$" );?>
-	$endfor$
-		</style>
-$endif$
-		<style>code{white-space: pre;}</style>
+		<style type="text/css">code{white-space: pre;}</style>
 $if(quotes)$
-		<style>
-			q { quotes: "“" "”" "‘" "’"; }
-			.fontSizeXxSmall{font-size: xx-small;}
-			.displayNone{display: none;}
-		</style>
+		<style type="text/css">q { quotes: "“" "”" "‘" "’"; }</style>
 $endif$
 $if(highlighting-css)$
 		<style type="text/css">
@@ -74,52 +53,19 @@ $endif$
 $for(css)$
 		<link rel="stylesheet" href="/$css$">
 $endfor$
-$for(extraCss)$
-		<link rel="stylesheet" href="$extraCss$">
-$endfor$
 $if(math)$
   $math$
 $endif$
-		<script type='application/ld+json'> 
-			{
-			  "@context": "http://www.schema.org",
-			  "@type": "WebSite",
-			  "name": "$title$",
-			  "alternateName": "$description$",
-			  "url": "http://cwsvjudo.bplaced.net",
-			  "image": "http://cwsvjudo.bplaced.net/ressourcen/graphiken/logos/cwsvJudoLogoWappen.256w.png"
-			}
-		</script>
-$if(jsonSdFiles)$
-		<script type='application/ld+json'>
-	$for(jsonSdFiles)$
-			<?php include($$basePath."/ressourcen/structuredData/json/$jsonSdFiles$");?>
-	$endfor$
-		</script>
-$endif$
-$if(jsLibs)$
-	$for(jsLibs)$
-		<script src="$jsLibs$" type="text/javascript"></script>
-	$endfor$
-$endif$
-		<link rel="alternate" type="application/rss+xml" href="/rss">
-		<?php require_once($$basePath."/pages/shared/favicon.html.inc");?>
 $for(header-includes)$
-	$header-includes$
+		$header-includes$
 $endfor$
 	</head>
 	<body>
 <!-- Kopfzeile mit Titel, Promobildern und Breadcrumbs -->
 		<header class="cwsvHeader">
-			<img 
-				width="200" height="140" 
-				title="Judo im Chemnitzer WSV" alt="Judo im Chemnitzer WSV - Promo" 
-				src="http://cwsvjudo.bplaced.net/ressourcen/graphiken/banner/bannerlogo.1.jpg"
-			/>
-			<span>
-				<span>Judo</span>
-				<span><?php $$zitat = getRandomCite( getCwsvJudoDbConn() ); echo($$zitat['zitat']);?></span>
-			</span>
+			<img width="200" height="140" title="Judo im Chemnitzer WSV" alt="Judo im Chemnitzer WSV - Promo" src="http://cwsvjudo.bplaced.net/ressourcen/graphiken/banner/bannerlogo.1.jpg" />
+			<span>Judo</span>
+			<span class="breadcrumbs"></span>
 			<img 
 				width="64" height="52"
 				title="Judo im Chemnitzer WSV"
diff --git a/homepage/redesign2018/markdownExperiment/pandocTemplate/html5.pandocTemplate b/homepage/cwsvJudo/pandocTemplate/html5.pandocTemplate
similarity index 100%
rename from homepage/redesign2018/markdownExperiment/pandocTemplate/html5.pandocTemplate
rename to homepage/cwsvJudo/pandocTemplate/html5.pandocTemplate
diff --git a/homepage/redesign2018/markdownExperiment/phpLib/cwsvJudo/galTable.php b/homepage/cwsvJudo/phpLib/cwsvJudo/galTable.php
similarity index 100%
rename from homepage/redesign2018/markdownExperiment/phpLib/cwsvJudo/galTable.php
rename to homepage/cwsvJudo/phpLib/cwsvJudo/galTable.php
diff --git a/homepage/redesign2018/markdownExperiment/phpLib/cwsvJudo/gallery.lib.php b/homepage/cwsvJudo/phpLib/cwsvJudo/gallery.lib.php
similarity index 100%
rename from homepage/redesign2018/markdownExperiment/phpLib/cwsvJudo/gallery.lib.php
rename to homepage/cwsvJudo/phpLib/cwsvJudo/gallery.lib.php
diff --git a/homepage/redesign2018/markdownExperiment/phpLib/cwsvJudo/galleryRedirector.php b/homepage/cwsvJudo/phpLib/cwsvJudo/galleryRedirector.php
similarity index 100%
rename from homepage/redesign2018/markdownExperiment/phpLib/cwsvJudo/galleryRedirector.php
rename to homepage/cwsvJudo/phpLib/cwsvJudo/galleryRedirector.php
diff --git a/homepage/redesign2018/markdownExperiment/phpLib/cwsvJudo/miscAssis.php b/homepage/cwsvJudo/phpLib/cwsvJudo/miscAssis.php
similarity index 100%
rename from homepage/redesign2018/markdownExperiment/phpLib/cwsvJudo/miscAssis.php
rename to homepage/cwsvJudo/phpLib/cwsvJudo/miscAssis.php
diff --git a/homepage/redesign2018/markdownExperiment/phpLib/cwsvJudo/newsLib.php b/homepage/cwsvJudo/phpLib/cwsvJudo/newsLib.php
similarity index 88%
rename from homepage/redesign2018/markdownExperiment/phpLib/cwsvJudo/newsLib.php
rename to homepage/cwsvJudo/phpLib/cwsvJudo/newsLib.php
index 01e0bac..c5736b0 100644
--- a/homepage/redesign2018/markdownExperiment/phpLib/cwsvJudo/newsLib.php
+++ b/homepage/cwsvJudo/phpLib/cwsvJudo/newsLib.php
@@ -1,13 +1,13 @@
 <?php
 
 function get_inner_html( $node ) {
-    $innerHTML= '';
-    $children = $node->childNodes;
-    foreach ($children as $child) {
-        $innerHTML .= $child->ownerDocument->saveXML( $child );
-    }
+	$innerHTML= '';
+	$children = $node->childNodes;
+	foreach ($children as $child) {
+		$innerHTML .= $child->ownerDocument->saveXML( $child );
+	}
 
-    return $innerHTML;
+	return $innerHTML;
 }
 
 /// Eine Liste mit News abfragen
@@ -162,9 +162,9 @@ return json_encode(
 		'@type'=>"NewsArticle",
 		'mainEntityOfPage'=>array(
 			'@type'=>"WebPage",
-			'@id'=>"https://cwsvjudo.bplaced.net/news/".$aNews['nr']."/".toAscii($aNews['datum']."-".$aNews['betreff'])
+			'@id'=>"http://cwsvjudo.bplaced.net/news/".$aNews['nr']."/".toAscii($aNews['datum']."-".$aNews['betreff'])
 		),
-		'headline'=>"Article headline",
+		'headline'=>$aNews['betreff'],
 		'image'=>array(
 			"http://cwsvjudo.bplaced.net/ressourcen/graphiken/logos/cwsvJudoLogoWappen.256w.png"
 		),
@@ -172,7 +172,8 @@ return json_encode(
 		'dateModified'=>$aNews['datum'],
 		'author'=>array(
 			'@type'=>"Person",
-			'name'=>$aNews['autor']
+			'name'=>$aNews['autor'],
+			'url'=>"://cwsvjudo.bplaced.net"
 		),
 		'publisher'=>array(
 			'@type'=>"Organization",
@@ -203,9 +204,9 @@ function img2ampimg($inText){
   $outText = $inText;
   // Zuweilen sind im Nachtrichtentext selbst auch schon Bilder, auch diese müssen bei ampSeiten angepasst werden
   if( strpos( $_SERVER['ORIG_PATH_TRANSLATED'], "pages/amp" ) !== false ){
-    // bei bereits im Newstext vorhandenen Bildern, gehen wir davon aus, dass widt+heigth bereits gesetzt sind
-    $outText = str_replace("<img ", "<amp-img layout=\"responsive\" ", $outText);
-    $outText = str_replace("/>", "></amp-img>", $outText);
+	// bei bereits im Newstext vorhandenen Bildern, gehen wir davon aus, dass widt+heigth bereits gesetzt sind
+	$outText = str_replace("<img ", "<amp-img layout=\"responsive\" ", $outText);
+	$outText = str_replace("/>", "></amp-img>", $outText);
   }
 
   return $outText;
@@ -215,10 +216,10 @@ function video2ampvideo($inText){
   $outText = $inText;
   // Zuweilen sind im Nachtrichtentext selbst auch schon Bilder, auch diese müssen bei ampSeiten angepasst werden
   if( strpos( $_SERVER['ORIG_PATH_TRANSLATED'], "pages/amp" ) !== false ){
-    // bei bereits im Newstext vorhandenen Bildern, gehen wir davon aus, dass widt+heigth bereits gesetzt sind
-    $outText = str_replace("<video ", "<amp-video ", $outText);
-    $outText = str_replace("<source ", "<source type=\"video/webm\" ", $outText);
-    $outText = str_replace("</video>", "</amp-video>", $outText);
+	// bei bereits im Newstext vorhandenen Bildern, gehen wir davon aus, dass widt+heigth bereits gesetzt sind
+	$outText = str_replace("<video ", "<amp-video ", $outText);
+	$outText = str_replace("<source ", "<source type=\"video/webm\" ", $outText);
+	$outText = str_replace("</video>", "</amp-video>", $outText);
   }
 
   return $outText;
@@ -227,7 +228,7 @@ function video2ampvideo($inText){
 function ampTagReplace($inText){
 // replace the amp tags
   return video2ampvideo(
-    img2ampimg( $inText )
+	img2ampimg( $inText )
   );
 }
 ?>
diff --git a/homepage/redesign2018/markdownExperiment/phpLib/cwsvJudo/newsTableHtml.php b/homepage/cwsvJudo/phpLib/cwsvJudo/newsTableHtml.php
similarity index 100%
rename from homepage/redesign2018/markdownExperiment/phpLib/cwsvJudo/newsTableHtml.php
rename to homepage/cwsvJudo/phpLib/cwsvJudo/newsTableHtml.php
diff --git a/homepage/redesign2018/markdownExperiment/phpLib/cwsvJudo/wkKalender.php b/homepage/cwsvJudo/phpLib/cwsvJudo/wkKalender.php
similarity index 100%
rename from homepage/redesign2018/markdownExperiment/phpLib/cwsvJudo/wkKalender.php
rename to homepage/cwsvJudo/phpLib/cwsvJudo/wkKalender.php
diff --git a/homepage/redesign2018/markdownExperiment/phpLib/cwsvJudo/wkQrCode.php b/homepage/cwsvJudo/phpLib/cwsvJudo/wkQrCode.php
similarity index 100%
rename from homepage/redesign2018/markdownExperiment/phpLib/cwsvJudo/wkQrCode.php
rename to homepage/cwsvJudo/phpLib/cwsvJudo/wkQrCode.php
diff --git a/homepage/redesign2018/markdownExperiment/phpLib/imgGallery.bplaced/imgPicker.php b/homepage/cwsvJudo/phpLib/imgGallery.bplaced/imgPicker.php
similarity index 100%
rename from homepage/redesign2018/markdownExperiment/phpLib/imgGallery.bplaced/imgPicker.php
rename to homepage/cwsvJudo/phpLib/imgGallery.bplaced/imgPicker.php
diff --git a/homepage/redesign2018/markdownExperiment/phpLib/imgGallery.bplaced/index.php.tmpl b/homepage/cwsvJudo/phpLib/imgGallery.bplaced/index.php.tmpl
similarity index 100%
rename from homepage/redesign2018/markdownExperiment/phpLib/imgGallery.bplaced/index.php.tmpl
rename to homepage/cwsvJudo/phpLib/imgGallery.bplaced/index.php.tmpl
diff --git a/homepage/redesign2018/markdownExperiment/phpLib/imgGallery.bplaced/indexDev.php.tmpl b/homepage/cwsvJudo/phpLib/imgGallery.bplaced/indexDev.php.tmpl
similarity index 100%
rename from homepage/redesign2018/markdownExperiment/phpLib/imgGallery.bplaced/indexDev.php.tmpl
rename to homepage/cwsvJudo/phpLib/imgGallery.bplaced/indexDev.php.tmpl
diff --git a/homepage/redesign2018/markdownExperiment/phpLib/imgGallery.bplaced/view.php.tmpl b/homepage/cwsvJudo/phpLib/imgGallery.bplaced/view.php.tmpl
similarity index 100%
rename from homepage/redesign2018/markdownExperiment/phpLib/imgGallery.bplaced/view.php.tmpl
rename to homepage/cwsvJudo/phpLib/imgGallery.bplaced/view.php.tmpl
diff --git a/homepage/redesign2018/markdownExperiment/phpLib/imgGallery.square7/imgPicker.php b/homepage/cwsvJudo/phpLib/imgGallery.square7/imgPicker.php
similarity index 100%
rename from homepage/redesign2018/markdownExperiment/phpLib/imgGallery.square7/imgPicker.php
rename to homepage/cwsvJudo/phpLib/imgGallery.square7/imgPicker.php
diff --git a/homepage/redesign2018/markdownExperiment/phpLib/imgGallery.square7/index.php.tmpl b/homepage/cwsvJudo/phpLib/imgGallery.square7/index.php.tmpl
similarity index 100%
rename from homepage/redesign2018/markdownExperiment/phpLib/imgGallery.square7/index.php.tmpl
rename to homepage/cwsvJudo/phpLib/imgGallery.square7/index.php.tmpl
diff --git a/homepage/redesign2018/markdownExperiment/phpLib/imgGallery.square7/index.php.tmpl.old b/homepage/cwsvJudo/phpLib/imgGallery.square7/index.php.tmpl.old
similarity index 100%
rename from homepage/redesign2018/markdownExperiment/phpLib/imgGallery.square7/index.php.tmpl.old
rename to homepage/cwsvJudo/phpLib/imgGallery.square7/index.php.tmpl.old
diff --git a/homepage/redesign2018/markdownExperiment/phpLib/imgGallery.square7/indexDev.php.tmpl b/homepage/cwsvJudo/phpLib/imgGallery.square7/indexDev.php.tmpl
similarity index 100%
rename from homepage/redesign2018/markdownExperiment/phpLib/imgGallery.square7/indexDev.php.tmpl
rename to homepage/cwsvJudo/phpLib/imgGallery.square7/indexDev.php.tmpl
diff --git a/homepage/cwsvJudo/phpLib/imgGallery.square7/indexDev.php.tmpl~ b/homepage/cwsvJudo/phpLib/imgGallery.square7/indexDev.php.tmpl~
new file mode 100644
index 0000000..28cacdd
--- /dev/null
+++ b/homepage/cwsvJudo/phpLib/imgGallery.square7/indexDev.php.tmpl~
@@ -0,0 +1,324 @@
+<?php
+// Daten der Datenbank laden
+	require_once($_SERVER['DOCUMENT_ROOT']."/bonus/db.inc");
+
+/// Abfrage der ausgewählten Bilder einer Galerie
+function getPickedImages($aMysqlConn, $aGalId){
+$retPickedImages = array();
+/// Erstmal bisher ausgewählte Bilder abfragen ...
+	$queryPickedImages = sprintf(
+		"SELECT * FROM cwsvjudo.galImgPicker WHERE galId = '%s';",
+		$aMysqlConn->real_escape_string($aGalId)
+	);
+	
+//	die($queryPickedImages);
+	
+	$resultsPickedImages = $aMysqlConn->query($queryPickedImages);
+	
+	/// @todo Wie kann ich hier sinnvoll einen Fehler zurückliefern? Nullpointer?
+	if( !$resultsPickedImages ){
+		$retMessage['error'] .= "Fehler ('".$aMysqlConn->error."') bei Datenbankabfrage '".$queryPickedImages."'<br />";
+		die( "Fehler ('".$aMysqlConn->error."') bei Datenbankabfrage '".$queryPickedImages."'<br />");
+	}
+	else{
+		while( $pickedImagesResult = $resultsPickedImages->fetch_assoc() ){
+			$retPickedImages = array_merge($retPickedImages, explode(',', $pickedImagesResult['pickedImages']) );
+		}
+	}
+//print_r($retPickedImages); die();
+return array_unique( $retPickedImages );
+}/// Ende getPickedImages
+
+/// Hilfsfunktion zum anpassen der htmlDescription
+function descrName($aName){
+	$retVal = "Bilder der Judoka des Chemnitzer WSV beim Wettkampf ".$aName;
+	if( strpos($aName, "Sommerabschlussgrillen") >= 0 ) $retVal = "Bilder der Judoka des Chemnitzer WSV beim ".$aName;
+	if( strpos($aName, "Jahrendefeier") >= 0 ) $retVal = "Bilder der Judoka des Chemnitzer WSV bei der ".$aName;
+return $retVal;
+}/// Ende descrName
+
+	$loginStatus = "false";
+	$chooseMode = "false";
+	$showAllMode = "false";
+	$messages = array();
+	$galleryId = "0";
+	$pickedImages = array();
+	
+/// Übergebene galleryId abfragen
+	if( !empty($_GET['galId'] ) ) $galleryId = $_GET['galId'];
+	/// @todo Woher erhalte ich die galleryID, wenn sie nicht übergeben wird?
+	
+/// Nachschauen, ob alle Bilder gezeigt werden sollen
+	if( $_GET['showAll']  == "true" )
+		$showAllMode = "true";
+	
+// Testen, ob wir im Bilderauswahlmodus sind...
+	if($_GET['chooseMode'] == "true"){
+		$chooseMode = "true";
+	// Falls ja, dann teste, ob man angemeldet ist
+	/// @todo brauche ich das, wenn ich nur testen will, ob bereits angemeldet ist? -> anscheinend ja!
+		session_start();
+		session_regenerate_id();
+	// Falls der serverseitige Logincookie nicht gesetzt ist 
+		if( empty($_SESSION['login']) ){
+			$loginStatus = "false";
+			$messages['info'] .= "Info: Der Bilderauswahlmodus ist nur möglich, wenn man angemeldet ist!<br />";
+		}
+		else{
+			$loginStatus = "true";
+			/// @todo Testen, ob eine intZahl vorliegt
+			/// @todo Testen, ob wir in der richtigen Galerie sind
+			$messages['info'] .= "Info: Der Bilderauswahlmodus für Galerie ".$galleryId." ist aktiv!<br />";
+		}
+	}
+	
+	$mysqlConn = @new mysqli($db_server, $db_user, $db_password, $db_name);
+	
+	if($mysqlConn->connect_error){
+		$message['error'] .= "Fehler: Datenbankverbindung fehlgeschlagen: " . $mysqlConn->connect_error . "<br />";
+	}
+	else{
+		$pickedImages = getPickedImages( $mysqlConn, $galleryId );
+		$mysqlConn->close();
+	}
+	
+/// Überschreiben der imgList mit den ausgewählten Bildern
+	$allImgList = $imgList; // Sicherungskopie
+	
+	if( count($pickedImages) > 24 )
+		$pickedImages = array_rand( $pickedImages, 24);
+	else{
+		$restImages = array_diff( $allImgList, $pickedImages );
+//		echo("restImages: "); print_r($restImages);
+		foreach( array_rand( $restImages, 24-count($pickedImages) ) as $k ) {
+		  $pickedImages[] = $restImages[$k];
+		}
+//		echo("pickedImages: "); print_r($pickedImages);
+	}
+	$imgList = $pickedImages;
+//	echo("imgList: "); print_r($imgList);
+	
+	/// @todo ein Sortieren nach dem ursprünglichen Index fehlt
+	usort($imgList, function($a, $b) use($allImgList){return array_search($a, $allImgList) > array_search($b, $allImgList);} );
+	$imgList = array_values( $imgList );// Zum reNummerieren
+//	echo("imgList: "); print_r($imgList);
+<<<<<<< HEAD
+	
+	if( $showAllMode == "true") $imgList = $allImgList;
+	
+=======
+
+>>>>>>> d971010d9cd5d2b4b6e4aea87836759422091f96
+	$imgInfos = array();
+	foreach( $imgList as $imgName ){
+		array_push( $imgInfos, getimagesize("thumbs/".str_replace(".jpg", ".png", $imgName)));
+	}
+
+?>
+<!DOCTYPE HTML>
+<html lang="de">
+	<head>
+		<title><?php echo $wkName?> - Bilderalbum</title>
+		<meta http-equiv="Content-Type" content="text/html; charset=utf-8">
+		<meta name="description" content="<?php echo descrName($wkName);?>">
+		<meta name="keywords" content="Album, Fotos">
+		<!-- BluimpGallery Zeug -->
+		<meta name="viewport" content="width=device-width, initial-scale=1.0">
+		<link rel="stylesheet" href="/ressourcen/blueimpGallery/css/blueimp-gallery.css">
+		<link rel="stylesheet" href="/ressourcen/blueimpGallery/css/blueimp-gallery-indicator.css">
+		<link rel="stylesheet" href="/ressourcen/blueimpGallery/css/blueimp-gallery-video.css">
+
+<!-- favIcon und Co nach der empfehlung von https://github.com/audreyr/favicon-cheat-sheet -->
+		<link rel="shortcut icon" type="image/x-icon" sizes="16x16 32x32 48x48 64x64" href="/ressourcen/graphiken/logos/favicon/favicon.ico">
+		<link rel="apple-touch-icon" sizes="152x152" href="/ressourcen/graphiken/logos/apple-touch-icon/apple-touch-icon-152.png" />
+		<link rel="apple-touch-icon" sizes="180x180" href="/ressourcen/graphiken/logos/apple-touch-icon/apple-touch-icon-180.png" />
+		<link rel="manifest" href="/manifest.json">
+
+		<link rel="canonical" href="http://cwsvjudo.bplaced.net<?php echo $_SERVER['REQUEST_URI']?>" />
+
+		<script type="text/javascript" src="/ressourcen/jsLib/jquery-3.1.1.min.js"></script>
+		<script type="text/javascript" src="/ressourcen/jsLib/jquery.lazyload.min.js"></script>
+		<style>
+			.lazy{ display: none;}
+			.smallFont{font-size: small;}
+			.centerText{text-align: center;}
+			.navButton{
+				box-sizing: border-box;
+				border-color: white;
+				border-style: outset;
+				border-radius: 1em;
+				text-align: center;
+				text-decoration: none;
+				cursor: pointer;
+				display: inline-block;
+				padding-left: .5em;
+				padding-right: .5em;
+				padding: 0;
+				margin: 0;
+			}
+		</style>
+	</head>
+	<body style="color: #000000; background-color: #FFAE00"  >
+		<?php
+			include( $_SERVER['DOCUMENT_ROOT'].'/ressourcen/phpLib/is_mobile.php');
+			if(is_mobile()) echo "<a title=\"Galerien der Judoka des Chemnitzer WSV\" href=\"/pages/mobile/verein.wettkampfgalerien.php\">Zur Galerieübersicht</a>";
+			else            echo "<a title=\"Galerien der Judoka des Chemnitzer WSV\" href=\"/pages/desktop/verein.galerien.php\">Zur Galerieübersicht</a>";
+		?>
+<?php
+/// Eine kleine Messagebox
+		if( !empty($messages) ){
+?>
+		<div style="border: 1px solid black">
+<?php
+			if( !empty( $messages['info'] ) ) echo( $messages['info'] );
+?>
+		</div>
+<?php
+		}
+//		echo("pickedImages: "); print_r($pickedImages);
+/// Ende MessageBox
+?>
+		
+		<h1 class="centerText" >
+			Photoalbum [<b><?php echo $wkName?></b>]
+		</h1>
+<?php
+		if( $showAllMode == "true" ){
+?>
+		<p class="centerText smallFont">
+			[<?php echo count($imgList)?> Bilder]
+		</p>
+<?php 
+		}
+		else{
+?>
+		<a href=<?php echo( "\"?galId=".(empty($galleryId)?"0":$galleryId)."&showAll=true\"");?>><div class="navButton" style="width: 100%;">Alle Bilder einblenden	</div></a>
+<?php
+		}
+?>
+		<p class="centerText smallFont">
+			Auf die jeweiligen Bilder klicken um eine größere Ansicht zu bekommen.
+		</p>
+		<hr/>
+		<!-- The container for the list of example images -->
+		<div id="links" class="links centerText">
+			<?php
+				if( $chooseMode == "true" ){
+					echo( "<form action=\"http://cwsvjudo.bplaced.net/ressourcen/phpLib/imgGallery/imgPicker.php\" method=\"post\">" );
+					echo( "<input type=\"hidden\" name=\"galId\" value=\"".$galleryId."\">" );
+				}
+				$imgSize = count( $imgList );
+				for( $imgIndex = 0; $imgIndex < $imgSize; ++$imgIndex){
+/// Das Bild soll nur angezeigt werden, falls es ausgewählt ist, oder alle gezeigt werden sollen
+//					if( $chooseMode == "true" || $showAllMode == "true" || in_array($imgList[$imgIndex], $pickedImages) ){
+						if( $chooseMode == "true" ){
+							echo( "<label><input type=\"checkbox\" name=\"pickedImages[]\" value=\"".$imgList[$imgIndex]."\">" );
+						}
+						echo "\t\t\t\t<span>".
+								"<img class=\"lazy\" ". 
+									"id=\"Image".( $imgIndex )."\" ".
+									"data-original=\"./thumbs/".str_replace(".jpg", ".png", $imgList[$imgIndex])."\" ".
+									$imgInfos[$imgIndex][3]." ".
+									"alt=\"[".( $imgIndex )."/".( $imgSize )."]\" ".
+									"title=\"".( $wkName )." Bild ".( $imgIndex +1 )." von ".( $imgSize )."\" ".
+									"onclick=\"startGalleryShow(" . $imgIndex . ");\"".
+								"/>".
+							"</span>\n";
+						if( $chooseMode == "true" ){
+							echo( "</label>" );
+						}
+//					}
+				}
+				if( $chooseMode == "true" ){
+					echo( "<button type=\"submit\">Eingaben absenden</button>" );
+					echo( "</form>" );
+				}
+			?>
+			<noscript>
+				<?php
+					$imgSize = count( $imgList );
+					for( $imgIndex = 0; $imgIndex < $imgSize; ++$imgIndex){
+						echo
+							"\t\t\t\t<span>".
+								"<a href=\"view.php?index=".( $imgIndex )."\" >".
+								"<img id=\"Image".( $imgIndex + 1)."\" ".
+//									"src=\"./thumbs/".str_replace(".jpg", ".png", $imgList[$imgIndex])."\" ".
+									"src=\"./thumbs/r_".str_replace(".jpg", ".png", $imgList[$imgIndex])."\" ".
+									"alt=\"[".( $imgIndex )."/".( $imgSize )."]\" ".
+									"title=\"".( $wkName )." Bild ".( $imgIndex + 1 )." von ".( $imgSize )."\" ".
+								"/>".
+								"</a>".
+							"</span>\n";
+					}
+				?>
+			</noscript>
+		</div>
+		<script type="text/javascript" charset="utf-8">
+			$(function() {
+				$("img.lazy").show().lazyload();
+//				$("img.lazy").lazyload();
+			});
+		</script>
+<!-- BluimpGalerry Lightbox Version -->
+		<!-- The Gallery as lightbox dialog, should be a child element of the document body -->
+		<div id="blueimp-gallery" class="blueimp-gallery blueimp-gallery-controls">
+			<div class="slides"></div>
+			<h2 class="title"><?php echo $wkName?></h2>
+			<a class="prev">‹</a>
+			<a class="next">›</a>
+			<a class="close">×</a>
+			<a class="play-pause"></a>
+			<ol class="indicator"></ol>
+		</div>
+		<script type="text/javascript" src="/ressourcen/blueimpGallery/js/blueimp-gallery.min.js"></script>
+		<script type="text/javascript" src="/ressourcen/blueimpGallery/js/jquery.blueimp-gallery.min.js"></script>
+		<script>
+			function startGalleryShow(startIndex = 0){
+			var imgList = [
+				<?php 
+					$imgSize = count( $imgList );
+					for( $imgIndex = 0; $imgIndex < $imgSize; ++$imgIndex){
+						echo "\"".( $imgList[ $imgIndex ] )."\", ";
+					}
+				?>];
+			var gallery = blueimp.Gallery(
+				imgList,
+				{
+					onslide: function (index, slide) {
+						var counterUrl = "/expCounter/counter.php";
+						var pageUrl = encodeURIComponent( window.location.href ) + "?index=" + index.toString();
+						var pageTitle = document.title + " [" + index.toString() + "]";
+						var callUrl = counterUrl + "?jscode_version=1.2&chCounter_mode=js&status=active&visible=0&page_title=" + pageTitle + "&page_url=" + pageUrl;
+						
+						var xmlHttp = new XMLHttpRequest();
+						xmlHttp.open("GET", callUrl, true); // true for asynchronous 
+						xmlHttp.send(null);
+					},
+					startSlideshow: true,
+					stretchImages: true,
+					index: startIndex,
+				}
+			);
+			};
+			
+			window.onload = function () { 
+				startGalleryShow();
+			};
+//			startGalleryShow();
+		</script>
+		<hr/>
+<!--Beginn der Einbindung des Counters-->
+<?php
+$chCounter_template = <<<TEMPLATE
+<table>
+ <tr>
+  <td>Besucher online: {V_VISITORS_CURRENTLY_ONLINE}</td>
+  <td>Besucher bisher: {V_PAGE_VIEWS_THIS_PAGE}</td>
+ </tr>
+</table>
+TEMPLATE;
+$chCounter_page_title = "Photoalbum ".$wkName;
+$chCounter_visible=1; include( $_SERVER['DOCUMENT_ROOT'].'/expCounter/counter.php');?>
+<!--Ende der Einbindung des Counters-->
+	</body>
+</html>
diff --git a/homepage/redesign2018/markdownExperiment/phpLib/imgGallery.square7/view.php.tmpl b/homepage/cwsvJudo/phpLib/imgGallery.square7/view.php.tmpl
similarity index 100%
rename from homepage/redesign2018/markdownExperiment/phpLib/imgGallery.square7/view.php.tmpl
rename to homepage/cwsvJudo/phpLib/imgGallery.square7/view.php.tmpl
diff --git a/homepage/redesign2018/markdownExperiment/phpLib/imgGallery/imgPicker.php b/homepage/cwsvJudo/phpLib/imgGallery/imgPicker.php
similarity index 100%
rename from homepage/redesign2018/markdownExperiment/phpLib/imgGallery/imgPicker.php
rename to homepage/cwsvJudo/phpLib/imgGallery/imgPicker.php
diff --git a/homepage/redesign2018/markdownExperiment/phpLib/imgGallery/index.php.tmpl b/homepage/cwsvJudo/phpLib/imgGallery/index.php.tmpl
similarity index 100%
rename from homepage/redesign2018/markdownExperiment/phpLib/imgGallery/index.php.tmpl
rename to homepage/cwsvJudo/phpLib/imgGallery/index.php.tmpl
diff --git a/homepage/redesign2018/markdownExperiment/phpLib/imgGallery/view.php.tmpl b/homepage/cwsvJudo/phpLib/imgGallery/view.php.tmpl
similarity index 100%
rename from homepage/redesign2018/markdownExperiment/phpLib/imgGallery/view.php.tmpl
rename to homepage/cwsvJudo/phpLib/imgGallery/view.php.tmpl
diff --git a/homepage/redesign2018/markdownExperiment/phpLib/phplot-6.2.0.zip b/homepage/cwsvJudo/phpLib/phplot-6.2.0.zip
similarity index 100%
rename from homepage/redesign2018/markdownExperiment/phpLib/phplot-6.2.0.zip
rename to homepage/cwsvJudo/phpLib/phplot-6.2.0.zip
diff --git a/homepage/redesign2018/markdownExperiment/phpLib/phplot/phplot.php b/homepage/cwsvJudo/phpLib/phplot/phplot.php
similarity index 100%
rename from homepage/redesign2018/markdownExperiment/phpLib/phplot/phplot.php
rename to homepage/cwsvJudo/phpLib/phplot/phplot.php
diff --git a/homepage/redesign2018/markdownExperiment/phpLib/phplot/rgb.inc.php b/homepage/cwsvJudo/phpLib/phplot/rgb.inc.php
similarity index 100%
rename from homepage/redesign2018/markdownExperiment/phpLib/phplot/rgb.inc.php
rename to homepage/cwsvJudo/phpLib/phplot/rgb.inc.php
diff --git a/homepage/redesign2018/markdownExperiment/phpLib/videoGallery/videoGallery.tmpl.php b/homepage/cwsvJudo/phpLib/videoGallery/videoGallery.tmpl.php
similarity index 100%
rename from homepage/redesign2018/markdownExperiment/phpLib/videoGallery/videoGallery.tmpl.php
rename to homepage/cwsvJudo/phpLib/videoGallery/videoGallery.tmpl.php
diff --git a/homepage/redesign2018/markdownExperiment/readMe.md b/homepage/cwsvJudo/readMe.md
similarity index 100%
rename from homepage/redesign2018/markdownExperiment/readMe.md
rename to homepage/cwsvJudo/readMe.md
diff --git a/homepage/redesign2018/markdownExperiment/redirecting/pagesDesktop/redirecter.php b/homepage/cwsvJudo/redirecting/pagesDesktop/redirecter.php
similarity index 100%
rename from homepage/redesign2018/markdownExperiment/redirecting/pagesDesktop/redirecter.php
rename to homepage/cwsvJudo/redirecting/pagesDesktop/redirecter.php
diff --git a/homepage/redesign2018/markdownExperiment/redirecting/pagesDesktop/redirects.json b/homepage/cwsvJudo/redirecting/pagesDesktop/redirects.json
similarity index 100%
rename from homepage/redesign2018/markdownExperiment/redirecting/pagesDesktop/redirects.json
rename to homepage/cwsvJudo/redirecting/pagesDesktop/redirects.json
diff --git a/homepage/redesign2018/markdownExperiment/redirecting/pagesMobile/redirecter.php b/homepage/cwsvJudo/redirecting/pagesMobile/redirecter.php
similarity index 100%
rename from homepage/redesign2018/markdownExperiment/redirecting/pagesMobile/redirecter.php
rename to homepage/cwsvJudo/redirecting/pagesMobile/redirecter.php
diff --git a/homepage/redesign2018/markdownExperiment/redirecting/pagesMobile/redirects.json b/homepage/cwsvJudo/redirecting/pagesMobile/redirects.json
similarity index 100%
rename from homepage/redesign2018/markdownExperiment/redirecting/pagesMobile/redirects.json
rename to homepage/cwsvJudo/redirecting/pagesMobile/redirects.json
diff --git a/homepage/redesign2018/markdownExperiment/sitemap.xml b/homepage/cwsvJudo/sitemap.xml
similarity index 100%
rename from homepage/redesign2018/markdownExperiment/sitemap.xml
rename to homepage/cwsvJudo/sitemap.xml
diff --git a/homepage/redesign2018/markdownExperiment/sql/phpcountAndRedirector.sql b/homepage/cwsvJudo/sql/phpcountAndRedirector.sql
similarity index 100%
rename from homepage/redesign2018/markdownExperiment/sql/phpcountAndRedirector.sql
rename to homepage/cwsvJudo/sql/phpcountAndRedirector.sql
diff --git a/homepage/redesign2018/markdownExperiment/src/Makefiles/Makefile.ftpUpload b/homepage/cwsvJudo/src/Makefiles/Makefile.ftpUpload
similarity index 100%
rename from homepage/redesign2018/markdownExperiment/src/Makefiles/Makefile.ftpUpload
rename to homepage/cwsvJudo/src/Makefiles/Makefile.ftpUpload
diff --git a/homepage/redesign2018/markdownExperiment/src/Makefiles/Makefile.jsonAlbum b/homepage/cwsvJudo/src/Makefiles/Makefile.jsonAlbum
similarity index 100%
rename from homepage/redesign2018/markdownExperiment/src/Makefiles/Makefile.jsonAlbum
rename to homepage/cwsvJudo/src/Makefiles/Makefile.jsonAlbum
diff --git a/homepage/redesign2018/markdownExperiment/src/Makefiles/Makefile.pngCompress b/homepage/cwsvJudo/src/Makefiles/Makefile.pngCompress
similarity index 100%
rename from homepage/redesign2018/markdownExperiment/src/Makefiles/Makefile.pngCompress
rename to homepage/cwsvJudo/src/Makefiles/Makefile.pngCompress
diff --git a/homepage/redesign2018/markdownExperiment/src/Makefiles/Makefile.shiaiVidsSpeedupTest b/homepage/cwsvJudo/src/Makefiles/Makefile.shiaiVidsSpeedupTest
similarity index 100%
rename from homepage/redesign2018/markdownExperiment/src/Makefiles/Makefile.shiaiVidsSpeedupTest
rename to homepage/cwsvJudo/src/Makefiles/Makefile.shiaiVidsSpeedupTest
diff --git a/homepage/redesign2018/markdownExperiment/src/Makefiles/Makefile.vidstab b/homepage/cwsvJudo/src/Makefiles/Makefile.vidstab
similarity index 100%
rename from homepage/redesign2018/markdownExperiment/src/Makefiles/Makefile.vidstab
rename to homepage/cwsvJudo/src/Makefiles/Makefile.vidstab
diff --git a/homepage/redesign2018/markdownExperiment/src/Makefiles/Makefile.vidstabAv1Cq b/homepage/cwsvJudo/src/Makefiles/Makefile.vidstabAv1Cq
similarity index 100%
rename from homepage/redesign2018/markdownExperiment/src/Makefiles/Makefile.vidstabAv1Cq
rename to homepage/cwsvJudo/src/Makefiles/Makefile.vidstabAv1Cq
diff --git a/homepage/redesign2018/markdownExperiment/src/Makefiles/Makefile.vidstabTest b/homepage/cwsvJudo/src/Makefiles/Makefile.vidstabTest
similarity index 100%
rename from homepage/redesign2018/markdownExperiment/src/Makefiles/Makefile.vidstabTest
rename to homepage/cwsvJudo/src/Makefiles/Makefile.vidstabTest
diff --git a/homepage/redesign2018/markdownExperiment/src/Makefiles/Makefile.vidstabVp9Cq b/homepage/cwsvJudo/src/Makefiles/Makefile.vidstabVp9Cq
similarity index 100%
rename from homepage/redesign2018/markdownExperiment/src/Makefiles/Makefile.vidstabVp9Cq
rename to homepage/cwsvJudo/src/Makefiles/Makefile.vidstabVp9Cq
diff --git a/homepage/redesign2018/markdownExperiment/src/Makefiles/Makefile.vp9 b/homepage/cwsvJudo/src/Makefiles/Makefile.vp9
similarity index 100%
rename from homepage/redesign2018/markdownExperiment/src/Makefiles/Makefile.vp9
rename to homepage/cwsvJudo/src/Makefiles/Makefile.vp9
diff --git a/homepage/redesign2018/markdownExperiment/src/Makefiles/Makefile.vp9encodeGoogleVodRecommendations b/homepage/cwsvJudo/src/Makefiles/Makefile.vp9encodeGoogleVodRecommendations
similarity index 100%
rename from homepage/redesign2018/markdownExperiment/src/Makefiles/Makefile.vp9encodeGoogleVodRecommendations
rename to homepage/cwsvJudo/src/Makefiles/Makefile.vp9encodeGoogleVodRecommendations
diff --git a/homepage/redesign2018/markdownExperiment/src/Makefiles/Makefiles.recursiveVariableTest/Makefile b/homepage/cwsvJudo/src/Makefiles/Makefiles.recursiveVariableTest/Makefile
similarity index 100%
rename from homepage/redesign2018/markdownExperiment/src/Makefiles/Makefiles.recursiveVariableTest/Makefile
rename to homepage/cwsvJudo/src/Makefiles/Makefiles.recursiveVariableTest/Makefile
diff --git a/homepage/redesign2018/markdownExperiment/src/Makefiles/Makefiles.recursiveVariableTest/Makefile.cfg b/homepage/cwsvJudo/src/Makefiles/Makefiles.recursiveVariableTest/Makefile.cfg
similarity index 100%
rename from homepage/redesign2018/markdownExperiment/src/Makefiles/Makefiles.recursiveVariableTest/Makefile.cfg
rename to homepage/cwsvJudo/src/Makefiles/Makefiles.recursiveVariableTest/Makefile.cfg
diff --git a/homepage/redesign2018/markdownExperiment/src/Makefiles/Makefiles.recursiveVariableTest/Makefile.sub b/homepage/cwsvJudo/src/Makefiles/Makefiles.recursiveVariableTest/Makefile.sub
similarity index 100%
rename from homepage/redesign2018/markdownExperiment/src/Makefiles/Makefiles.recursiveVariableTest/Makefile.sub
rename to homepage/cwsvJudo/src/Makefiles/Makefiles.recursiveVariableTest/Makefile.sub
diff --git a/homepage/redesign2018/markdownExperiment/src/Makefiles/Makefiles.vidGal.d/Makefile.deshakeVp9 b/homepage/cwsvJudo/src/Makefiles/Makefiles.vidGal.d/Makefile.deshakeVp9
similarity index 100%
rename from homepage/redesign2018/markdownExperiment/src/Makefiles/Makefiles.vidGal.d/Makefile.deshakeVp9
rename to homepage/cwsvJudo/src/Makefiles/Makefiles.vidGal.d/Makefile.deshakeVp9
diff --git a/homepage/redesign2018/markdownExperiment/src/Makefiles/Makefiles.vidGal.d/Makefile.vidGal b/homepage/cwsvJudo/src/Makefiles/Makefiles.vidGal.d/Makefile.vidGal
similarity index 100%
rename from homepage/redesign2018/markdownExperiment/src/Makefiles/Makefiles.vidGal.d/Makefile.vidGal
rename to homepage/cwsvJudo/src/Makefiles/Makefiles.vidGal.d/Makefile.vidGal
diff --git a/homepage/redesign2018/markdownExperiment/src/Makefiles/Makefiles.vidGal.d/Makefile.vidGal.cfg b/homepage/cwsvJudo/src/Makefiles/Makefiles.vidGal.d/Makefile.vidGal.cfg
similarity index 100%
rename from homepage/redesign2018/markdownExperiment/src/Makefiles/Makefiles.vidGal.d/Makefile.vidGal.cfg
rename to homepage/cwsvJudo/src/Makefiles/Makefiles.vidGal.d/Makefile.vidGal.cfg
diff --git a/homepage/redesign2018/markdownExperiment/src/Makefiles/Makefiles.vidGal.d/Makefile.webmCompress b/homepage/cwsvJudo/src/Makefiles/Makefiles.vidGal.d/Makefile.webmCompress
similarity index 100%
rename from homepage/redesign2018/markdownExperiment/src/Makefiles/Makefiles.vidGal.d/Makefile.webmCompress
rename to homepage/cwsvJudo/src/Makefiles/Makefiles.vidGal.d/Makefile.webmCompress
diff --git a/homepage/redesign2018/markdownExperiment/src/Makefiles/Makefiles.vidGal.d/Makefile.webmCompress.cfg b/homepage/cwsvJudo/src/Makefiles/Makefiles.vidGal.d/Makefile.webmCompress.cfg
similarity index 100%
rename from homepage/redesign2018/markdownExperiment/src/Makefiles/Makefiles.vidGal.d/Makefile.webmCompress.cfg
rename to homepage/cwsvJudo/src/Makefiles/Makefiles.vidGal.d/Makefile.webmCompress.cfg
diff --git a/homepage/redesign2018/markdownExperiment/src/Makefiles/Makefiles.vidGalQuick.d/Makefile.vidGal b/homepage/cwsvJudo/src/Makefiles/Makefiles.vidGalQuick.d/Makefile.vidGal
similarity index 100%
rename from homepage/redesign2018/markdownExperiment/src/Makefiles/Makefiles.vidGalQuick.d/Makefile.vidGal
rename to homepage/cwsvJudo/src/Makefiles/Makefiles.vidGalQuick.d/Makefile.vidGal
diff --git a/homepage/redesign2018/markdownExperiment/src/Makefiles/Makefiles.vidGalQuick.d/Makefile.vidGal.cfg b/homepage/cwsvJudo/src/Makefiles/Makefiles.vidGalQuick.d/Makefile.vidGal.cfg
similarity index 100%
rename from homepage/redesign2018/markdownExperiment/src/Makefiles/Makefiles.vidGalQuick.d/Makefile.vidGal.cfg
rename to homepage/cwsvJudo/src/Makefiles/Makefiles.vidGalQuick.d/Makefile.vidGal.cfg
diff --git a/homepage/redesign2018/markdownExperiment/src/Makefiles/Makefiles.vidGalQuick.d/Makefile.webmCompress b/homepage/cwsvJudo/src/Makefiles/Makefiles.vidGalQuick.d/Makefile.webmCompress
similarity index 100%
rename from homepage/redesign2018/markdownExperiment/src/Makefiles/Makefiles.vidGalQuick.d/Makefile.webmCompress
rename to homepage/cwsvJudo/src/Makefiles/Makefiles.vidGalQuick.d/Makefile.webmCompress
diff --git a/homepage/redesign2018/markdownExperiment/src/Makefiles/Makefiles.vidGalQuick.d/Makefile.webmCompress.cfg b/homepage/cwsvJudo/src/Makefiles/Makefiles.vidGalQuick.d/Makefile.webmCompress.cfg
similarity index 100%
rename from homepage/redesign2018/markdownExperiment/src/Makefiles/Makefiles.vidGalQuick.d/Makefile.webmCompress.cfg
rename to homepage/cwsvJudo/src/Makefiles/Makefiles.vidGalQuick.d/Makefile.webmCompress.cfg
diff --git a/homepage/redesign2018/markdownExperiment/src/css/cwsvJudo-2018-content.css b/homepage/cwsvJudo/src/css/cwsvJudo-2018-content.css
similarity index 100%
rename from homepage/redesign2018/markdownExperiment/src/css/cwsvJudo-2018-content.css
rename to homepage/cwsvJudo/src/css/cwsvJudo-2018-content.css
diff --git a/homepage/redesign2018/markdownExperiment/src/css/cwsvJudo-2018-footer.css b/homepage/cwsvJudo/src/css/cwsvJudo-2018-footer.css
similarity index 100%
rename from homepage/redesign2018/markdownExperiment/src/css/cwsvJudo-2018-footer.css
rename to homepage/cwsvJudo/src/css/cwsvJudo-2018-footer.css
diff --git a/homepage/redesign2018/markdownExperiment/src/css/cwsvJudo-2018-galTable.css b/homepage/cwsvJudo/src/css/cwsvJudo-2018-galTable.css
similarity index 100%
rename from homepage/redesign2018/markdownExperiment/src/css/cwsvJudo-2018-galTable.css
rename to homepage/cwsvJudo/src/css/cwsvJudo-2018-galTable.css
diff --git a/homepage/redesign2018/markdownExperiment/src/css/cwsvJudo-2018-header.css b/homepage/cwsvJudo/src/css/cwsvJudo-2018-header.css
similarity index 100%
rename from homepage/redesign2018/markdownExperiment/src/css/cwsvJudo-2018-header.css
rename to homepage/cwsvJudo/src/css/cwsvJudo-2018-header.css
diff --git a/homepage/redesign2018/markdownExperiment/src/css/cwsvJudo-2018-layout.css b/homepage/cwsvJudo/src/css/cwsvJudo-2018-layout.css
similarity index 100%
rename from homepage/redesign2018/markdownExperiment/src/css/cwsvJudo-2018-layout.css
rename to homepage/cwsvJudo/src/css/cwsvJudo-2018-layout.css
diff --git a/homepage/redesign2018/markdownExperiment/src/css/cwsvJudo-2018-mainNav.css b/homepage/cwsvJudo/src/css/cwsvJudo-2018-mainNav.css
similarity index 100%
rename from homepage/redesign2018/markdownExperiment/src/css/cwsvJudo-2018-mainNav.css
rename to homepage/cwsvJudo/src/css/cwsvJudo-2018-mainNav.css
diff --git a/homepage/redesign2018/markdownExperiment/src/css/cwsvJudo-2018-news.css b/homepage/cwsvJudo/src/css/cwsvJudo-2018-news.css
similarity index 100%
rename from homepage/redesign2018/markdownExperiment/src/css/cwsvJudo-2018-news.css
rename to homepage/cwsvJudo/src/css/cwsvJudo-2018-news.css
diff --git a/homepage/redesign2018/markdownExperiment/src/css/cwsvJudo-2018-quiz.css b/homepage/cwsvJudo/src/css/cwsvJudo-2018-quiz.css
similarity index 100%
rename from homepage/redesign2018/markdownExperiment/src/css/cwsvJudo-2018-quiz.css
rename to homepage/cwsvJudo/src/css/cwsvJudo-2018-quiz.css
diff --git a/homepage/redesign2018/markdownExperiment/src/css/cwsvJudo-2018-sideBar.css b/homepage/cwsvJudo/src/css/cwsvJudo-2018-sideBar.css
similarity index 100%
rename from homepage/redesign2018/markdownExperiment/src/css/cwsvJudo-2018-sideBar.css
rename to homepage/cwsvJudo/src/css/cwsvJudo-2018-sideBar.css
diff --git a/homepage/redesign2018/markdownExperiment/src/css/cwsvJudo-2018-sponsorList.css b/homepage/cwsvJudo/src/css/cwsvJudo-2018-sponsorList.css
similarity index 100%
rename from homepage/redesign2018/markdownExperiment/src/css/cwsvJudo-2018-sponsorList.css
rename to homepage/cwsvJudo/src/css/cwsvJudo-2018-sponsorList.css
diff --git a/homepage/redesign2018/markdownExperiment/src/css/cwsvJudo-2018-subNav.css b/homepage/cwsvJudo/src/css/cwsvJudo-2018-subNav.css
similarity index 100%
rename from homepage/redesign2018/markdownExperiment/src/css/cwsvJudo-2018-subNav.css
rename to homepage/cwsvJudo/src/css/cwsvJudo-2018-subNav.css
diff --git a/homepage/redesign2018/markdownExperiment/src/css/cwsvJudo-2018-wkKalender.css b/homepage/cwsvJudo/src/css/cwsvJudo-2018-wkKalender.css
similarity index 100%
rename from homepage/redesign2018/markdownExperiment/src/css/cwsvJudo-2018-wkKalender.css
rename to homepage/cwsvJudo/src/css/cwsvJudo-2018-wkKalender.css
diff --git a/homepage/redesign2018/markdownExperiment/src/css/cwsvJudo-2018-wkParticipo.css b/homepage/cwsvJudo/src/css/cwsvJudo-2018-wkParticipo.css
similarity index 100%
rename from homepage/redesign2018/markdownExperiment/src/css/cwsvJudo-2018-wkParticipo.css
rename to homepage/cwsvJudo/src/css/cwsvJudo-2018-wkParticipo.css
diff --git a/homepage/redesign2018/markdownExperiment/src/css/cwsvJudo-2018.css b/homepage/cwsvJudo/src/css/cwsvJudo-2018.css
similarity index 100%
rename from homepage/redesign2018/markdownExperiment/src/css/cwsvJudo-2018.css
rename to homepage/cwsvJudo/src/css/cwsvJudo-2018.css
diff --git a/homepage/redesign2018/markdownExperiment/src/galleryHelper/findFiles.py b/homepage/cwsvJudo/src/galleryHelper/findFiles.py
similarity index 100%
rename from homepage/redesign2018/markdownExperiment/src/galleryHelper/findFiles.py
rename to homepage/cwsvJudo/src/galleryHelper/findFiles.py
diff --git a/homepage/redesign2018/markdownExperiment/src/galleryHelper/getFfmpegFlags.py b/homepage/cwsvJudo/src/galleryHelper/getFfmpegFlags.py
similarity index 100%
rename from homepage/redesign2018/markdownExperiment/src/galleryHelper/getFfmpegFlags.py
rename to homepage/cwsvJudo/src/galleryHelper/getFfmpegFlags.py
diff --git a/homepage/redesign2018/markdownExperiment/src/galleryHelper/getVideoDuration.py b/homepage/cwsvJudo/src/galleryHelper/getVideoDuration.py
similarity index 100%
rename from homepage/redesign2018/markdownExperiment/src/galleryHelper/getVideoDuration.py
rename to homepage/cwsvJudo/src/galleryHelper/getVideoDuration.py
diff --git a/homepage/redesign2018/markdownExperiment/src/galleryHelper/getVideoDurationJson.py b/homepage/cwsvJudo/src/galleryHelper/getVideoDurationJson.py
similarity index 100%
rename from homepage/redesign2018/markdownExperiment/src/galleryHelper/getVideoDurationJson.py
rename to homepage/cwsvJudo/src/galleryHelper/getVideoDurationJson.py
diff --git a/homepage/redesign2018/markdownExperiment/src/galleryHelper/vidGal.php b/homepage/cwsvJudo/src/galleryHelper/vidGal.php
similarity index 100%
rename from homepage/redesign2018/markdownExperiment/src/galleryHelper/vidGal.php
rename to homepage/cwsvJudo/src/galleryHelper/vidGal.php
diff --git a/homepage/redesign2018/markdownExperiment/src/galleryHelper/vidGalInsert.py b/homepage/cwsvJudo/src/galleryHelper/vidGalInsert.py
similarity index 100%
rename from homepage/redesign2018/markdownExperiment/src/galleryHelper/vidGalInsert.py
rename to homepage/cwsvJudo/src/galleryHelper/vidGalInsert.py
diff --git a/homepage/redesign2018/markdownExperiment/src/galleryHelper/videoGallery.tmpl.php b/homepage/cwsvJudo/src/galleryHelper/videoGallery.tmpl.php
similarity index 100%
rename from homepage/redesign2018/markdownExperiment/src/galleryHelper/videoGallery.tmpl.php
rename to homepage/cwsvJudo/src/galleryHelper/videoGallery.tmpl.php
diff --git a/homepage/redesign2018/markdownExperiment/src/galleryHelper/videoGalleryVue.tmpl.php b/homepage/cwsvJudo/src/galleryHelper/videoGalleryVue.tmpl.php
similarity index 100%
rename from homepage/redesign2018/markdownExperiment/src/galleryHelper/videoGalleryVue.tmpl.php
rename to homepage/cwsvJudo/src/galleryHelper/videoGalleryVue.tmpl.php
diff --git a/homepage/redesign2018/markdownExperiment/src/galleryHelper/yamlRead.py b/homepage/cwsvJudo/src/galleryHelper/yamlRead.py
similarity index 100%
rename from homepage/redesign2018/markdownExperiment/src/galleryHelper/yamlRead.py
rename to homepage/cwsvJudo/src/galleryHelper/yamlRead.py
diff --git a/homepage/redesign2018/markdownExperiment/src/galleryTemplates/config.inc.php b/homepage/cwsvJudo/src/galleryTemplates/config.inc.php
similarity index 100%
rename from homepage/redesign2018/markdownExperiment/src/galleryTemplates/config.inc.php
rename to homepage/cwsvJudo/src/galleryTemplates/config.inc.php
diff --git a/homepage/redesign2018/markdownExperiment/src/galleryTemplates/indexBilderInArbeit.php b/homepage/cwsvJudo/src/galleryTemplates/indexBilderInArbeit.php
similarity index 100%
rename from homepage/redesign2018/markdownExperiment/src/galleryTemplates/indexBilderInArbeit.php
rename to homepage/cwsvJudo/src/galleryTemplates/indexBilderInArbeit.php
diff --git a/homepage/redesign2018/markdownExperiment/src/galleryTemplates/indexHier.php b/homepage/cwsvJudo/src/galleryTemplates/indexHier.php
similarity index 100%
rename from homepage/redesign2018/markdownExperiment/src/galleryTemplates/indexHier.php
rename to homepage/cwsvJudo/src/galleryTemplates/indexHier.php
diff --git a/homepage/redesign2018/markdownExperiment/src/galleryTemplates/indexInArbeit.php b/homepage/cwsvJudo/src/galleryTemplates/indexInArbeit.php
similarity index 100%
rename from homepage/redesign2018/markdownExperiment/src/galleryTemplates/indexInArbeit.php
rename to homepage/cwsvJudo/src/galleryTemplates/indexInArbeit.php
diff --git a/homepage/redesign2018/markdownExperiment/src/imgGallery/gallery.template.php b/homepage/cwsvJudo/src/imgGallery/gallery.template.php
similarity index 100%
rename from homepage/redesign2018/markdownExperiment/src/imgGallery/gallery.template.php
rename to homepage/cwsvJudo/src/imgGallery/gallery.template.php
diff --git a/homepage/redesign2018/markdownExperiment/src/imgGallery/imgPicker.php b/homepage/cwsvJudo/src/imgGallery/imgPicker.php
similarity index 100%
rename from homepage/redesign2018/markdownExperiment/src/imgGallery/imgPicker.php
rename to homepage/cwsvJudo/src/imgGallery/imgPicker.php
diff --git a/homepage/redesign2018/markdownExperiment/src/imgGallery/index.php.tmpl b/homepage/cwsvJudo/src/imgGallery/index.php.tmpl
similarity index 100%
rename from homepage/redesign2018/markdownExperiment/src/imgGallery/index.php.tmpl
rename to homepage/cwsvJudo/src/imgGallery/index.php.tmpl
diff --git a/homepage/redesign2018/markdownExperiment/src/imgGallery/indexDev.php.tmpl b/homepage/cwsvJudo/src/imgGallery/indexDev.php.tmpl
similarity index 100%
rename from homepage/redesign2018/markdownExperiment/src/imgGallery/indexDev.php.tmpl
rename to homepage/cwsvJudo/src/imgGallery/indexDev.php.tmpl
diff --git a/homepage/redesign2018/markdownExperiment/src/imgGallery/view.php.tmpl b/homepage/cwsvJudo/src/imgGallery/view.php.tmpl
similarity index 100%
rename from homepage/redesign2018/markdownExperiment/src/imgGallery/view.php.tmpl
rename to homepage/cwsvJudo/src/imgGallery/view.php.tmpl
diff --git a/homepage/redesign2018/markdownExperiment/src/jsonSd/cwsv.json b/homepage/cwsvJudo/src/jsonSd/cwsv.json
similarity index 100%
rename from homepage/redesign2018/markdownExperiment/src/jsonSd/cwsv.json
rename to homepage/cwsvJudo/src/jsonSd/cwsv.json
diff --git a/homepage/redesign2018/markdownExperiment/src/jsonSd/cwsvDojoAsSportsActivityLocation.json b/homepage/cwsvJudo/src/jsonSd/cwsvDojoAsSportsActivityLocation.json
similarity index 100%
rename from homepage/redesign2018/markdownExperiment/src/jsonSd/cwsvDojoAsSportsActivityLocation.json
rename to homepage/cwsvJudo/src/jsonSd/cwsvDojoAsSportsActivityLocation.json
diff --git a/homepage/redesign2018/markdownExperiment/src/jsonSd/cwsvJudo.json b/homepage/cwsvJudo/src/jsonSd/cwsvJudo.json
similarity index 100%
rename from homepage/redesign2018/markdownExperiment/src/jsonSd/cwsvJudo.json
rename to homepage/cwsvJudo/src/jsonSd/cwsvJudo.json
diff --git a/homepage/redesign2018/markdownExperiment/src/jsonSd/cwsvJudoAsPublisher.json b/homepage/cwsvJudo/src/jsonSd/cwsvJudoAsPublisher.json
similarity index 100%
rename from homepage/redesign2018/markdownExperiment/src/jsonSd/cwsvJudoAsPublisher.json
rename to homepage/cwsvJudo/src/jsonSd/cwsvJudoAsPublisher.json
diff --git a/homepage/redesign2018/markdownExperiment/src/jsonSd/cwsvJudoWebsite.json b/homepage/cwsvJudo/src/jsonSd/cwsvJudoWebsite.json
similarity index 100%
rename from homepage/redesign2018/markdownExperiment/src/jsonSd/cwsvJudoWebsite.json
rename to homepage/cwsvJudo/src/jsonSd/cwsvJudoWebsite.json
diff --git a/homepage/redesign2018/markdownExperiment/src/md/datenschutz.md b/homepage/cwsvJudo/src/md/datenschutz.md
similarity index 100%
rename from homepage/redesign2018/markdownExperiment/src/md/datenschutz.md
rename to homepage/cwsvJudo/src/md/datenschutz.md
diff --git a/homepage/redesign2018/markdownExperiment/src/md/download.md b/homepage/cwsvJudo/src/md/download.md
similarity index 100%
rename from homepage/redesign2018/markdownExperiment/src/md/download.md
rename to homepage/cwsvJudo/src/md/download.md
diff --git a/homepage/redesign2018/markdownExperiment/src/md/extras.md b/homepage/cwsvJudo/src/md/extras.md
similarity index 100%
rename from homepage/redesign2018/markdownExperiment/src/md/extras.md
rename to homepage/cwsvJudo/src/md/extras.md
diff --git a/homepage/redesign2018/markdownExperiment/src/md/galerie.md b/homepage/cwsvJudo/src/md/galerie.md
similarity index 100%
rename from homepage/redesign2018/markdownExperiment/src/md/galerie.md
rename to homepage/cwsvJudo/src/md/galerie.md
diff --git a/homepage/redesign2018/markdownExperiment/src/md/galerien.md b/homepage/cwsvJudo/src/md/galerien.md
similarity index 100%
rename from homepage/redesign2018/markdownExperiment/src/md/galerien.md
rename to homepage/cwsvJudo/src/md/galerien.md
diff --git a/homepage/redesign2018/markdownExperiment/src/md/hilfsmittel.md b/homepage/cwsvJudo/src/md/hilfsmittel.md
similarity index 100%
rename from homepage/redesign2018/markdownExperiment/src/md/hilfsmittel.md
rename to homepage/cwsvJudo/src/md/hilfsmittel.md
diff --git a/homepage/redesign2018/markdownExperiment/src/md/impressum.md b/homepage/cwsvJudo/src/md/impressum.md
similarity index 100%
rename from homepage/redesign2018/markdownExperiment/src/md/impressum.md
rename to homepage/cwsvJudo/src/md/impressum.md
diff --git a/homepage/redesign2018/markdownExperiment/src/md/index.md b/homepage/cwsvJudo/src/md/index.md
similarity index 100%
rename from homepage/redesign2018/markdownExperiment/src/md/index.md
rename to homepage/cwsvJudo/src/md/index.md
diff --git a/homepage/redesign2018/markdownExperiment/src/md/kontakt.md b/homepage/cwsvJudo/src/md/kontakt.md
similarity index 100%
rename from homepage/redesign2018/markdownExperiment/src/md/kontakt.md
rename to homepage/cwsvJudo/src/md/kontakt.md
diff --git a/homepage/redesign2018/markdownExperiment/src/md/links.md b/homepage/cwsvJudo/src/md/links.md
similarity index 100%
rename from homepage/redesign2018/markdownExperiment/src/md/links.md
rename to homepage/cwsvJudo/src/md/links.md
diff --git a/homepage/redesign2018/markdownExperiment/src/md/news.md b/homepage/cwsvJudo/src/md/news.md
similarity index 100%
rename from homepage/redesign2018/markdownExperiment/src/md/news.md
rename to homepage/cwsvJudo/src/md/news.md
diff --git a/homepage/redesign2018/markdownExperiment/src/md/quiz.md b/homepage/cwsvJudo/src/md/quiz.md
similarity index 100%
rename from homepage/redesign2018/markdownExperiment/src/md/quiz.md
rename to homepage/cwsvJudo/src/md/quiz.md
diff --git a/homepage/redesign2018/markdownExperiment/src/md/trainingszeiten.md b/homepage/cwsvJudo/src/md/trainingszeiten.md
similarity index 100%
rename from homepage/redesign2018/markdownExperiment/src/md/trainingszeiten.md
rename to homepage/cwsvJudo/src/md/trainingszeiten.md
diff --git a/homepage/redesign2018/markdownExperiment/src/md/verein.md b/homepage/cwsvJudo/src/md/verein.md
similarity index 100%
rename from homepage/redesign2018/markdownExperiment/src/md/verein.md
rename to homepage/cwsvJudo/src/md/verein.md
diff --git a/homepage/redesign2018/markdownExperiment/src/md/wkKalender.md b/homepage/cwsvJudo/src/md/wkKalender.md
similarity index 100%
rename from homepage/redesign2018/markdownExperiment/src/md/wkKalender.md
rename to homepage/cwsvJudo/src/md/wkKalender.md
diff --git a/homepage/redesign2018/markdownExperiment/src/phpLibs/phpCount/phpcount.php b/homepage/cwsvJudo/src/phpLibs/phpCount/phpcount.php
similarity index 100%
rename from homepage/redesign2018/markdownExperiment/src/phpLibs/phpCount/phpcount.php
rename to homepage/cwsvJudo/src/phpLibs/phpCount/phpcount.php
diff --git a/homepage/redesign2018/markdownExperiment/src/shared/ehrungen.html.inc b/homepage/cwsvJudo/src/shared/ehrungen.html.inc
similarity index 100%
rename from homepage/redesign2018/markdownExperiment/src/shared/ehrungen.html.inc
rename to homepage/cwsvJudo/src/shared/ehrungen.html.inc
diff --git a/homepage/redesign2018/markdownExperiment/src/shared/favicon.html.inc b/homepage/cwsvJudo/src/shared/favicon.html.inc
similarity index 100%
rename from homepage/redesign2018/markdownExperiment/src/shared/favicon.html.inc
rename to homepage/cwsvJudo/src/shared/favicon.html.inc
diff --git a/homepage/redesign2018/markdownExperiment/src/shared/faviconAmp.inc.html b/homepage/cwsvJudo/src/shared/faviconAmp.inc.html
similarity index 100%
rename from homepage/redesign2018/markdownExperiment/src/shared/faviconAmp.inc.html
rename to homepage/cwsvJudo/src/shared/faviconAmp.inc.html
diff --git a/homepage/redesign2018/markdownExperiment/src/shared/sponsorlist.inc.amp b/homepage/cwsvJudo/src/shared/sponsorlist.inc.amp
similarity index 100%
rename from homepage/redesign2018/markdownExperiment/src/shared/sponsorlist.inc.amp
rename to homepage/cwsvJudo/src/shared/sponsorlist.inc.amp
diff --git a/homepage/redesign2018/markdownExperiment/src/shared/sponsorlist.inc.html b/homepage/cwsvJudo/src/shared/sponsorlist.inc.html
similarity index 100%
rename from homepage/redesign2018/markdownExperiment/src/shared/sponsorlist.inc.html
rename to homepage/cwsvJudo/src/shared/sponsorlist.inc.html
diff --git a/homepage/redesign2018/markdownExperiment/src/tools/config.inc.php b/homepage/cwsvJudo/src/tools/config.inc.php
similarity index 100%
rename from homepage/redesign2018/markdownExperiment/src/tools/config.inc.php
rename to homepage/cwsvJudo/src/tools/config.inc.php
diff --git a/homepage/redesign2018/markdownExperiment/src/tools/index.php b/homepage/cwsvJudo/src/tools/index.php
similarity index 100%
rename from homepage/redesign2018/markdownExperiment/src/tools/index.php
rename to homepage/cwsvJudo/src/tools/index.php
diff --git a/homepage/redesign2018/markdownExperiment/src/tools/indexHier.php b/homepage/cwsvJudo/src/tools/indexHier.php
similarity index 100%
rename from homepage/redesign2018/markdownExperiment/src/tools/indexHier.php
rename to homepage/cwsvJudo/src/tools/indexHier.php
diff --git a/homepage/redesign2018/markdownExperiment/src/tools/indexInArbeit.php b/homepage/cwsvJudo/src/tools/indexInArbeit.php
similarity index 100%
rename from homepage/redesign2018/markdownExperiment/src/tools/indexInArbeit.php
rename to homepage/cwsvJudo/src/tools/indexInArbeit.php
diff --git a/homepage/cwsvJudo/src/tools/mkGalGen/2006-09-30_zwergenturnier/.htaccess b/homepage/cwsvJudo/src/tools/mkGalGen/2006-09-30_zwergenturnier/.htaccess
new file mode 100644
index 0000000..605d2f4
--- /dev/null
+++ b/homepage/cwsvJudo/src/tools/mkGalGen/2006-09-30_zwergenturnier/.htaccess
@@ -0,0 +1 @@
+Allow from all
diff --git a/homepage/cwsvJudo/src/tools/mkGalGen/2006-09-30_zwergenturnier/120x90/01.jpg b/homepage/cwsvJudo/src/tools/mkGalGen/2006-09-30_zwergenturnier/120x90/01.jpg
new file mode 100644
index 0000000..701f5be
Binary files /dev/null and b/homepage/cwsvJudo/src/tools/mkGalGen/2006-09-30_zwergenturnier/120x90/01.jpg differ
diff --git a/homepage/cwsvJudo/src/tools/mkGalGen/2006-09-30_zwergenturnier/120x90/02.jpg b/homepage/cwsvJudo/src/tools/mkGalGen/2006-09-30_zwergenturnier/120x90/02.jpg
new file mode 100644
index 0000000..370faa0
Binary files /dev/null and b/homepage/cwsvJudo/src/tools/mkGalGen/2006-09-30_zwergenturnier/120x90/02.jpg differ
diff --git a/homepage/cwsvJudo/src/tools/mkGalGen/2006-09-30_zwergenturnier/120x90/03.jpg b/homepage/cwsvJudo/src/tools/mkGalGen/2006-09-30_zwergenturnier/120x90/03.jpg
new file mode 100644
index 0000000..61fd6c8
Binary files /dev/null and b/homepage/cwsvJudo/src/tools/mkGalGen/2006-09-30_zwergenturnier/120x90/03.jpg differ
diff --git a/homepage/cwsvJudo/src/tools/mkGalGen/2006-09-30_zwergenturnier/120x90/04.jpg b/homepage/cwsvJudo/src/tools/mkGalGen/2006-09-30_zwergenturnier/120x90/04.jpg
new file mode 100644
index 0000000..4a83ece
Binary files /dev/null and b/homepage/cwsvJudo/src/tools/mkGalGen/2006-09-30_zwergenturnier/120x90/04.jpg differ
diff --git a/homepage/cwsvJudo/src/tools/mkGalGen/2006-09-30_zwergenturnier/120x90/05.jpg b/homepage/cwsvJudo/src/tools/mkGalGen/2006-09-30_zwergenturnier/120x90/05.jpg
new file mode 100644
index 0000000..a5b5324
Binary files /dev/null and b/homepage/cwsvJudo/src/tools/mkGalGen/2006-09-30_zwergenturnier/120x90/05.jpg differ
diff --git a/homepage/cwsvJudo/src/tools/mkGalGen/2006-09-30_zwergenturnier/120x90/06.jpg b/homepage/cwsvJudo/src/tools/mkGalGen/2006-09-30_zwergenturnier/120x90/06.jpg
new file mode 100644
index 0000000..2097811
Binary files /dev/null and b/homepage/cwsvJudo/src/tools/mkGalGen/2006-09-30_zwergenturnier/120x90/06.jpg differ
diff --git a/homepage/cwsvJudo/src/tools/mkGalGen/2006-09-30_zwergenturnier/120x90/07.jpg b/homepage/cwsvJudo/src/tools/mkGalGen/2006-09-30_zwergenturnier/120x90/07.jpg
new file mode 100644
index 0000000..c7e7e8a
Binary files /dev/null and b/homepage/cwsvJudo/src/tools/mkGalGen/2006-09-30_zwergenturnier/120x90/07.jpg differ
diff --git a/homepage/cwsvJudo/src/tools/mkGalGen/2006-09-30_zwergenturnier/120x90/08.jpg b/homepage/cwsvJudo/src/tools/mkGalGen/2006-09-30_zwergenturnier/120x90/08.jpg
new file mode 100644
index 0000000..ddd9a39
Binary files /dev/null and b/homepage/cwsvJudo/src/tools/mkGalGen/2006-09-30_zwergenturnier/120x90/08.jpg differ
diff --git a/homepage/cwsvJudo/src/tools/mkGalGen/2006-09-30_zwergenturnier/120x90/09.jpg b/homepage/cwsvJudo/src/tools/mkGalGen/2006-09-30_zwergenturnier/120x90/09.jpg
new file mode 100644
index 0000000..5d32f15
Binary files /dev/null and b/homepage/cwsvJudo/src/tools/mkGalGen/2006-09-30_zwergenturnier/120x90/09.jpg differ
diff --git a/homepage/cwsvJudo/src/tools/mkGalGen/2006-09-30_zwergenturnier/120x90/10.jpg b/homepage/cwsvJudo/src/tools/mkGalGen/2006-09-30_zwergenturnier/120x90/10.jpg
new file mode 100644
index 0000000..50ae132
Binary files /dev/null and b/homepage/cwsvJudo/src/tools/mkGalGen/2006-09-30_zwergenturnier/120x90/10.jpg differ
diff --git a/homepage/cwsvJudo/src/tools/mkGalGen/2006-09-30_zwergenturnier/120x90/11.jpg b/homepage/cwsvJudo/src/tools/mkGalGen/2006-09-30_zwergenturnier/120x90/11.jpg
new file mode 100644
index 0000000..4e93388
Binary files /dev/null and b/homepage/cwsvJudo/src/tools/mkGalGen/2006-09-30_zwergenturnier/120x90/11.jpg differ
diff --git a/homepage/cwsvJudo/src/tools/mkGalGen/2006-09-30_zwergenturnier/120x90/12.jpg b/homepage/cwsvJudo/src/tools/mkGalGen/2006-09-30_zwergenturnier/120x90/12.jpg
new file mode 100644
index 0000000..c5ca472
Binary files /dev/null and b/homepage/cwsvJudo/src/tools/mkGalGen/2006-09-30_zwergenturnier/120x90/12.jpg differ
diff --git a/homepage/cwsvJudo/src/tools/mkGalGen/2006-09-30_zwergenturnier/120x90/13.jpg b/homepage/cwsvJudo/src/tools/mkGalGen/2006-09-30_zwergenturnier/120x90/13.jpg
new file mode 100644
index 0000000..8ed3239
Binary files /dev/null and b/homepage/cwsvJudo/src/tools/mkGalGen/2006-09-30_zwergenturnier/120x90/13.jpg differ
diff --git a/homepage/cwsvJudo/src/tools/mkGalGen/2006-09-30_zwergenturnier/120x90/14.jpg b/homepage/cwsvJudo/src/tools/mkGalGen/2006-09-30_zwergenturnier/120x90/14.jpg
new file mode 100644
index 0000000..f534f1a
Binary files /dev/null and b/homepage/cwsvJudo/src/tools/mkGalGen/2006-09-30_zwergenturnier/120x90/14.jpg differ
diff --git a/homepage/cwsvJudo/src/tools/mkGalGen/2006-09-30_zwergenturnier/120x90/15.jpg b/homepage/cwsvJudo/src/tools/mkGalGen/2006-09-30_zwergenturnier/120x90/15.jpg
new file mode 100644
index 0000000..c696b18
Binary files /dev/null and b/homepage/cwsvJudo/src/tools/mkGalGen/2006-09-30_zwergenturnier/120x90/15.jpg differ
diff --git a/homepage/cwsvJudo/src/tools/mkGalGen/2006-09-30_zwergenturnier/120x90/16.jpg b/homepage/cwsvJudo/src/tools/mkGalGen/2006-09-30_zwergenturnier/120x90/16.jpg
new file mode 100644
index 0000000..3a7299a
Binary files /dev/null and b/homepage/cwsvJudo/src/tools/mkGalGen/2006-09-30_zwergenturnier/120x90/16.jpg differ
diff --git a/homepage/cwsvJudo/src/tools/mkGalGen/2006-09-30_zwergenturnier/120x90/17.jpg b/homepage/cwsvJudo/src/tools/mkGalGen/2006-09-30_zwergenturnier/120x90/17.jpg
new file mode 100644
index 0000000..e0072c7
Binary files /dev/null and b/homepage/cwsvJudo/src/tools/mkGalGen/2006-09-30_zwergenturnier/120x90/17.jpg differ
diff --git a/homepage/cwsvJudo/src/tools/mkGalGen/2006-09-30_zwergenturnier/120x90/18.jpg b/homepage/cwsvJudo/src/tools/mkGalGen/2006-09-30_zwergenturnier/120x90/18.jpg
new file mode 100644
index 0000000..6928003
Binary files /dev/null and b/homepage/cwsvJudo/src/tools/mkGalGen/2006-09-30_zwergenturnier/120x90/18.jpg differ
diff --git a/homepage/cwsvJudo/src/tools/mkGalGen/2006-09-30_zwergenturnier/120x90/19.jpg b/homepage/cwsvJudo/src/tools/mkGalGen/2006-09-30_zwergenturnier/120x90/19.jpg
new file mode 100644
index 0000000..709e6d4
Binary files /dev/null and b/homepage/cwsvJudo/src/tools/mkGalGen/2006-09-30_zwergenturnier/120x90/19.jpg differ
diff --git a/homepage/cwsvJudo/src/tools/mkGalGen/2006-09-30_zwergenturnier/120x90/20.jpg b/homepage/cwsvJudo/src/tools/mkGalGen/2006-09-30_zwergenturnier/120x90/20.jpg
new file mode 100644
index 0000000..1c22a50
Binary files /dev/null and b/homepage/cwsvJudo/src/tools/mkGalGen/2006-09-30_zwergenturnier/120x90/20.jpg differ
diff --git a/homepage/cwsvJudo/src/tools/mkGalGen/2006-09-30_zwergenturnier/120x90/21.jpg b/homepage/cwsvJudo/src/tools/mkGalGen/2006-09-30_zwergenturnier/120x90/21.jpg
new file mode 100644
index 0000000..50aa35a
Binary files /dev/null and b/homepage/cwsvJudo/src/tools/mkGalGen/2006-09-30_zwergenturnier/120x90/21.jpg differ
diff --git a/homepage/cwsvJudo/src/tools/mkGalGen/2006-09-30_zwergenturnier/120x90/22.jpg b/homepage/cwsvJudo/src/tools/mkGalGen/2006-09-30_zwergenturnier/120x90/22.jpg
new file mode 100644
index 0000000..8215bad
Binary files /dev/null and b/homepage/cwsvJudo/src/tools/mkGalGen/2006-09-30_zwergenturnier/120x90/22.jpg differ
diff --git a/homepage/cwsvJudo/src/tools/mkGalGen/2006-09-30_zwergenturnier/120x90/23.jpg b/homepage/cwsvJudo/src/tools/mkGalGen/2006-09-30_zwergenturnier/120x90/23.jpg
new file mode 100644
index 0000000..ede0a36
Binary files /dev/null and b/homepage/cwsvJudo/src/tools/mkGalGen/2006-09-30_zwergenturnier/120x90/23.jpg differ
diff --git a/homepage/cwsvJudo/src/tools/mkGalGen/2006-09-30_zwergenturnier/120x90/24.jpg b/homepage/cwsvJudo/src/tools/mkGalGen/2006-09-30_zwergenturnier/120x90/24.jpg
new file mode 100644
index 0000000..cc130f6
Binary files /dev/null and b/homepage/cwsvJudo/src/tools/mkGalGen/2006-09-30_zwergenturnier/120x90/24.jpg differ
diff --git a/homepage/cwsvJudo/src/tools/mkGalGen/2006-09-30_zwergenturnier/800x600/01.jpg b/homepage/cwsvJudo/src/tools/mkGalGen/2006-09-30_zwergenturnier/800x600/01.jpg
new file mode 100644
index 0000000..e650e19
Binary files /dev/null and b/homepage/cwsvJudo/src/tools/mkGalGen/2006-09-30_zwergenturnier/800x600/01.jpg differ
diff --git a/homepage/cwsvJudo/src/tools/mkGalGen/2006-09-30_zwergenturnier/800x600/02.jpg b/homepage/cwsvJudo/src/tools/mkGalGen/2006-09-30_zwergenturnier/800x600/02.jpg
new file mode 100644
index 0000000..d918990
Binary files /dev/null and b/homepage/cwsvJudo/src/tools/mkGalGen/2006-09-30_zwergenturnier/800x600/02.jpg differ
diff --git a/homepage/cwsvJudo/src/tools/mkGalGen/2006-09-30_zwergenturnier/800x600/03.jpg b/homepage/cwsvJudo/src/tools/mkGalGen/2006-09-30_zwergenturnier/800x600/03.jpg
new file mode 100644
index 0000000..dc7721f
Binary files /dev/null and b/homepage/cwsvJudo/src/tools/mkGalGen/2006-09-30_zwergenturnier/800x600/03.jpg differ
diff --git a/homepage/cwsvJudo/src/tools/mkGalGen/2006-09-30_zwergenturnier/800x600/04.jpg b/homepage/cwsvJudo/src/tools/mkGalGen/2006-09-30_zwergenturnier/800x600/04.jpg
new file mode 100644
index 0000000..38c6f95
Binary files /dev/null and b/homepage/cwsvJudo/src/tools/mkGalGen/2006-09-30_zwergenturnier/800x600/04.jpg differ
diff --git a/homepage/cwsvJudo/src/tools/mkGalGen/2006-09-30_zwergenturnier/800x600/05.jpg b/homepage/cwsvJudo/src/tools/mkGalGen/2006-09-30_zwergenturnier/800x600/05.jpg
new file mode 100644
index 0000000..08af332
Binary files /dev/null and b/homepage/cwsvJudo/src/tools/mkGalGen/2006-09-30_zwergenturnier/800x600/05.jpg differ
diff --git a/homepage/cwsvJudo/src/tools/mkGalGen/2006-09-30_zwergenturnier/800x600/06.jpg b/homepage/cwsvJudo/src/tools/mkGalGen/2006-09-30_zwergenturnier/800x600/06.jpg
new file mode 100644
index 0000000..e4b3d86
Binary files /dev/null and b/homepage/cwsvJudo/src/tools/mkGalGen/2006-09-30_zwergenturnier/800x600/06.jpg differ
diff --git a/homepage/cwsvJudo/src/tools/mkGalGen/2006-09-30_zwergenturnier/800x600/07.jpg b/homepage/cwsvJudo/src/tools/mkGalGen/2006-09-30_zwergenturnier/800x600/07.jpg
new file mode 100644
index 0000000..28b31ec
Binary files /dev/null and b/homepage/cwsvJudo/src/tools/mkGalGen/2006-09-30_zwergenturnier/800x600/07.jpg differ
diff --git a/homepage/cwsvJudo/src/tools/mkGalGen/2006-09-30_zwergenturnier/800x600/08.jpg b/homepage/cwsvJudo/src/tools/mkGalGen/2006-09-30_zwergenturnier/800x600/08.jpg
new file mode 100644
index 0000000..868a977
Binary files /dev/null and b/homepage/cwsvJudo/src/tools/mkGalGen/2006-09-30_zwergenturnier/800x600/08.jpg differ
diff --git a/homepage/cwsvJudo/src/tools/mkGalGen/2006-09-30_zwergenturnier/800x600/09.jpg b/homepage/cwsvJudo/src/tools/mkGalGen/2006-09-30_zwergenturnier/800x600/09.jpg
new file mode 100644
index 0000000..f3c4cad
Binary files /dev/null and b/homepage/cwsvJudo/src/tools/mkGalGen/2006-09-30_zwergenturnier/800x600/09.jpg differ
diff --git a/homepage/cwsvJudo/src/tools/mkGalGen/2006-09-30_zwergenturnier/800x600/10.jpg b/homepage/cwsvJudo/src/tools/mkGalGen/2006-09-30_zwergenturnier/800x600/10.jpg
new file mode 100644
index 0000000..da04be3
Binary files /dev/null and b/homepage/cwsvJudo/src/tools/mkGalGen/2006-09-30_zwergenturnier/800x600/10.jpg differ
diff --git a/homepage/cwsvJudo/src/tools/mkGalGen/2006-09-30_zwergenturnier/800x600/11.jpg b/homepage/cwsvJudo/src/tools/mkGalGen/2006-09-30_zwergenturnier/800x600/11.jpg
new file mode 100644
index 0000000..9f436f9
Binary files /dev/null and b/homepage/cwsvJudo/src/tools/mkGalGen/2006-09-30_zwergenturnier/800x600/11.jpg differ
diff --git a/homepage/cwsvJudo/src/tools/mkGalGen/2006-09-30_zwergenturnier/800x600/12.jpg b/homepage/cwsvJudo/src/tools/mkGalGen/2006-09-30_zwergenturnier/800x600/12.jpg
new file mode 100644
index 0000000..433197d
Binary files /dev/null and b/homepage/cwsvJudo/src/tools/mkGalGen/2006-09-30_zwergenturnier/800x600/12.jpg differ
diff --git a/homepage/cwsvJudo/src/tools/mkGalGen/2006-09-30_zwergenturnier/800x600/13.jpg b/homepage/cwsvJudo/src/tools/mkGalGen/2006-09-30_zwergenturnier/800x600/13.jpg
new file mode 100644
index 0000000..9bd07a4
Binary files /dev/null and b/homepage/cwsvJudo/src/tools/mkGalGen/2006-09-30_zwergenturnier/800x600/13.jpg differ
diff --git a/homepage/cwsvJudo/src/tools/mkGalGen/2006-09-30_zwergenturnier/800x600/14.jpg b/homepage/cwsvJudo/src/tools/mkGalGen/2006-09-30_zwergenturnier/800x600/14.jpg
new file mode 100644
index 0000000..8d01c56
Binary files /dev/null and b/homepage/cwsvJudo/src/tools/mkGalGen/2006-09-30_zwergenturnier/800x600/14.jpg differ
diff --git a/homepage/cwsvJudo/src/tools/mkGalGen/2006-09-30_zwergenturnier/800x600/15.jpg b/homepage/cwsvJudo/src/tools/mkGalGen/2006-09-30_zwergenturnier/800x600/15.jpg
new file mode 100644
index 0000000..e9c4206
Binary files /dev/null and b/homepage/cwsvJudo/src/tools/mkGalGen/2006-09-30_zwergenturnier/800x600/15.jpg differ
diff --git a/homepage/cwsvJudo/src/tools/mkGalGen/2006-09-30_zwergenturnier/800x600/16.jpg b/homepage/cwsvJudo/src/tools/mkGalGen/2006-09-30_zwergenturnier/800x600/16.jpg
new file mode 100644
index 0000000..1afd81a
Binary files /dev/null and b/homepage/cwsvJudo/src/tools/mkGalGen/2006-09-30_zwergenturnier/800x600/16.jpg differ
diff --git a/homepage/cwsvJudo/src/tools/mkGalGen/2006-09-30_zwergenturnier/800x600/17.jpg b/homepage/cwsvJudo/src/tools/mkGalGen/2006-09-30_zwergenturnier/800x600/17.jpg
new file mode 100644
index 0000000..7dc21a2
Binary files /dev/null and b/homepage/cwsvJudo/src/tools/mkGalGen/2006-09-30_zwergenturnier/800x600/17.jpg differ
diff --git a/homepage/cwsvJudo/src/tools/mkGalGen/2006-09-30_zwergenturnier/800x600/18.jpg b/homepage/cwsvJudo/src/tools/mkGalGen/2006-09-30_zwergenturnier/800x600/18.jpg
new file mode 100644
index 0000000..acc6eda
Binary files /dev/null and b/homepage/cwsvJudo/src/tools/mkGalGen/2006-09-30_zwergenturnier/800x600/18.jpg differ
diff --git a/homepage/cwsvJudo/src/tools/mkGalGen/2006-09-30_zwergenturnier/800x600/19.jpg b/homepage/cwsvJudo/src/tools/mkGalGen/2006-09-30_zwergenturnier/800x600/19.jpg
new file mode 100644
index 0000000..6b25767
Binary files /dev/null and b/homepage/cwsvJudo/src/tools/mkGalGen/2006-09-30_zwergenturnier/800x600/19.jpg differ
diff --git a/homepage/cwsvJudo/src/tools/mkGalGen/2006-09-30_zwergenturnier/800x600/20.jpg b/homepage/cwsvJudo/src/tools/mkGalGen/2006-09-30_zwergenturnier/800x600/20.jpg
new file mode 100644
index 0000000..765ecbf
Binary files /dev/null and b/homepage/cwsvJudo/src/tools/mkGalGen/2006-09-30_zwergenturnier/800x600/20.jpg differ
diff --git a/homepage/cwsvJudo/src/tools/mkGalGen/2006-09-30_zwergenturnier/800x600/21.jpg b/homepage/cwsvJudo/src/tools/mkGalGen/2006-09-30_zwergenturnier/800x600/21.jpg
new file mode 100644
index 0000000..da59d1d
Binary files /dev/null and b/homepage/cwsvJudo/src/tools/mkGalGen/2006-09-30_zwergenturnier/800x600/21.jpg differ
diff --git a/homepage/cwsvJudo/src/tools/mkGalGen/2006-09-30_zwergenturnier/800x600/22.jpg b/homepage/cwsvJudo/src/tools/mkGalGen/2006-09-30_zwergenturnier/800x600/22.jpg
new file mode 100644
index 0000000..06c4c38
Binary files /dev/null and b/homepage/cwsvJudo/src/tools/mkGalGen/2006-09-30_zwergenturnier/800x600/22.jpg differ
diff --git a/homepage/cwsvJudo/src/tools/mkGalGen/2006-09-30_zwergenturnier/800x600/23.jpg b/homepage/cwsvJudo/src/tools/mkGalGen/2006-09-30_zwergenturnier/800x600/23.jpg
new file mode 100644
index 0000000..20fafe6
Binary files /dev/null and b/homepage/cwsvJudo/src/tools/mkGalGen/2006-09-30_zwergenturnier/800x600/23.jpg differ
diff --git a/homepage/cwsvJudo/src/tools/mkGalGen/2006-09-30_zwergenturnier/800x600/24.jpg b/homepage/cwsvJudo/src/tools/mkGalGen/2006-09-30_zwergenturnier/800x600/24.jpg
new file mode 100644
index 0000000..95c53f7
Binary files /dev/null and b/homepage/cwsvJudo/src/tools/mkGalGen/2006-09-30_zwergenturnier/800x600/24.jpg differ
diff --git a/homepage/redesign2018/markdownExperiment/src/tools/mkGalGen/Makefile.mkGalGen b/homepage/cwsvJudo/src/tools/mkGalGen/Makefile.mkGalGen
similarity index 100%
rename from homepage/redesign2018/markdownExperiment/src/tools/mkGalGen/Makefile.mkGalGen
rename to homepage/cwsvJudo/src/tools/mkGalGen/Makefile.mkGalGen
diff --git a/homepage/redesign2018/markdownExperiment/src/tools/mkGalGen/ReadMe.md b/homepage/cwsvJudo/src/tools/mkGalGen/ReadMe.md
similarity index 100%
rename from homepage/redesign2018/markdownExperiment/src/tools/mkGalGen/ReadMe.md
rename to homepage/cwsvJudo/src/tools/mkGalGen/ReadMe.md
diff --git a/homepage/redesign2018/markdownExperiment/src/tools/mkGalGen/createImageList.py b/homepage/cwsvJudo/src/tools/mkGalGen/createImageList.py
similarity index 100%
rename from homepage/redesign2018/markdownExperiment/src/tools/mkGalGen/createImageList.py
rename to homepage/cwsvJudo/src/tools/mkGalGen/createImageList.py
diff --git a/homepage/redesign2018/markdownExperiment/src/tools/mkGalGen/jpgListCreator.py b/homepage/cwsvJudo/src/tools/mkGalGen/jpgListCreator.py
similarity index 100%
rename from homepage/redesign2018/markdownExperiment/src/tools/mkGalGen/jpgListCreator.py
rename to homepage/cwsvJudo/src/tools/mkGalGen/jpgListCreator.py
diff --git a/homepage/redesign2018/markdownExperiment/src/tools/mkGalGen/jpgListLoader.py b/homepage/cwsvJudo/src/tools/mkGalGen/jpgListLoader.py
similarity index 100%
rename from homepage/redesign2018/markdownExperiment/src/tools/mkGalGen/jpgListLoader.py
rename to homepage/cwsvJudo/src/tools/mkGalGen/jpgListLoader.py
diff --git a/homepage/redesign2018/markdownExperiment/src/tools/mkGalGen/jpgSelector.py b/homepage/cwsvJudo/src/tools/mkGalGen/jpgSelector.py
similarity index 100%
rename from homepage/redesign2018/markdownExperiment/src/tools/mkGalGen/jpgSelector.py
rename to homepage/cwsvJudo/src/tools/mkGalGen/jpgSelector.py
diff --git a/homepage/redesign2018/markdownExperiment/src/tools/mkGalGen/jsonAlbumTest-Template.sh b/homepage/cwsvJudo/src/tools/mkGalGen/jsonAlbumTest-Template.sh
similarity index 100%
rename from homepage/redesign2018/markdownExperiment/src/tools/mkGalGen/jsonAlbumTest-Template.sh
rename to homepage/cwsvJudo/src/tools/mkGalGen/jsonAlbumTest-Template.sh
diff --git a/homepage/redesign2018/markdownExperiment/src/tools/mkGalGen/jsonJpgList2IndexPhp.py b/homepage/cwsvJudo/src/tools/mkGalGen/jsonJpgList2IndexPhp.py
similarity index 100%
rename from homepage/redesign2018/markdownExperiment/src/tools/mkGalGen/jsonJpgList2IndexPhp.py
rename to homepage/cwsvJudo/src/tools/mkGalGen/jsonJpgList2IndexPhp.py
diff --git a/homepage/redesign2018/markdownExperiment/src/tools/mkGalGen/jsonJpgList2Makefile.py b/homepage/cwsvJudo/src/tools/mkGalGen/jsonJpgList2Makefile.py
similarity index 100%
rename from homepage/redesign2018/markdownExperiment/src/tools/mkGalGen/jsonJpgList2Makefile.py
rename to homepage/cwsvJudo/src/tools/mkGalGen/jsonJpgList2Makefile.py
diff --git a/homepage/redesign2018/markdownExperiment/src/tools/mkGalGen/jsonJpgList2ViewPhp.py b/homepage/cwsvJudo/src/tools/mkGalGen/jsonJpgList2ViewPhp.py
similarity index 100%
rename from homepage/redesign2018/markdownExperiment/src/tools/mkGalGen/jsonJpgList2ViewPhp.py
rename to homepage/cwsvJudo/src/tools/mkGalGen/jsonJpgList2ViewPhp.py
diff --git a/homepage/redesign2018/markdownExperiment/src/tools/mkGalGen/sortierer.py b/homepage/cwsvJudo/src/tools/mkGalGen/sortierer.py
similarity index 100%
rename from homepage/redesign2018/markdownExperiment/src/tools/mkGalGen/sortierer.py
rename to homepage/cwsvJudo/src/tools/mkGalGen/sortierer.py
diff --git a/homepage/redesign2018/markdownExperiment/src/tools/mkGalGen/testingArea/Makefile b/homepage/cwsvJudo/src/tools/mkGalGen/testingArea/Makefile
similarity index 100%
rename from homepage/redesign2018/markdownExperiment/src/tools/mkGalGen/testingArea/Makefile
rename to homepage/cwsvJudo/src/tools/mkGalGen/testingArea/Makefile
diff --git a/homepage/redesign2018/markdownExperiment/src/vidGa/config.inc.php b/homepage/cwsvJudo/src/vidGa/config.inc.php
similarity index 100%
rename from homepage/redesign2018/markdownExperiment/src/vidGa/config.inc.php
rename to homepage/cwsvJudo/src/vidGa/config.inc.php
diff --git a/homepage/redesign2018/markdownExperiment/src/vidGa/index.php b/homepage/cwsvJudo/src/vidGa/index.php
similarity index 100%
rename from homepage/redesign2018/markdownExperiment/src/vidGa/index.php
rename to homepage/cwsvJudo/src/vidGa/index.php
diff --git a/homepage/redesign2018/markdownExperiment/src/vidGa/videoGallery.tmpl.php b/homepage/cwsvJudo/src/vidGa/videoGallery.tmpl.php
similarity index 100%
rename from homepage/redesign2018/markdownExperiment/src/vidGa/videoGallery.tmpl.php
rename to homepage/cwsvJudo/src/vidGa/videoGallery.tmpl.php
diff --git a/homepage/redesign2018/markdownExperiment/src/yaml/datenschutz.subNav.yaml b/homepage/cwsvJudo/src/yaml/datenschutz.subNav.yaml
similarity index 100%
rename from homepage/redesign2018/markdownExperiment/src/yaml/datenschutz.subNav.yaml
rename to homepage/cwsvJudo/src/yaml/datenschutz.subNav.yaml
diff --git a/homepage/redesign2018/markdownExperiment/src/yaml/download.subNav.yaml b/homepage/cwsvJudo/src/yaml/download.subNav.yaml
similarity index 100%
rename from homepage/redesign2018/markdownExperiment/src/yaml/download.subNav.yaml
rename to homepage/cwsvJudo/src/yaml/download.subNav.yaml
diff --git a/homepage/redesign2018/markdownExperiment/src/yaml/extras.subNav.yaml b/homepage/cwsvJudo/src/yaml/extras.subNav.yaml
similarity index 100%
rename from homepage/redesign2018/markdownExperiment/src/yaml/extras.subNav.yaml
rename to homepage/cwsvJudo/src/yaml/extras.subNav.yaml
diff --git a/homepage/redesign2018/markdownExperiment/src/yaml/galerie.subNav.yaml b/homepage/cwsvJudo/src/yaml/galerie.subNav.yaml
similarity index 100%
rename from homepage/redesign2018/markdownExperiment/src/yaml/galerie.subNav.yaml
rename to homepage/cwsvJudo/src/yaml/galerie.subNav.yaml
diff --git a/homepage/redesign2018/markdownExperiment/src/yaml/galerien.subNav.yaml b/homepage/cwsvJudo/src/yaml/galerien.subNav.yaml
similarity index 100%
rename from homepage/redesign2018/markdownExperiment/src/yaml/galerien.subNav.yaml
rename to homepage/cwsvJudo/src/yaml/galerien.subNav.yaml
diff --git a/homepage/redesign2018/markdownExperiment/src/yaml/hilfsmittel.subNav.yaml b/homepage/cwsvJudo/src/yaml/hilfsmittel.subNav.yaml
similarity index 100%
rename from homepage/redesign2018/markdownExperiment/src/yaml/hilfsmittel.subNav.yaml
rename to homepage/cwsvJudo/src/yaml/hilfsmittel.subNav.yaml
diff --git a/homepage/redesign2018/markdownExperiment/src/yaml/images.yaml b/homepage/cwsvJudo/src/yaml/images.yaml
similarity index 100%
rename from homepage/redesign2018/markdownExperiment/src/yaml/images.yaml
rename to homepage/cwsvJudo/src/yaml/images.yaml
diff --git a/homepage/redesign2018/markdownExperiment/src/yaml/impressum.subNav.yaml b/homepage/cwsvJudo/src/yaml/impressum.subNav.yaml
similarity index 100%
rename from homepage/redesign2018/markdownExperiment/src/yaml/impressum.subNav.yaml
rename to homepage/cwsvJudo/src/yaml/impressum.subNav.yaml
diff --git a/homepage/redesign2018/markdownExperiment/src/yaml/index.subNav.yaml b/homepage/cwsvJudo/src/yaml/index.subNav.yaml
similarity index 100%
rename from homepage/redesign2018/markdownExperiment/src/yaml/index.subNav.yaml
rename to homepage/cwsvJudo/src/yaml/index.subNav.yaml
diff --git a/homepage/redesign2018/markdownExperiment/src/yaml/kontakt.subNav.yaml b/homepage/cwsvJudo/src/yaml/kontakt.subNav.yaml
similarity index 100%
rename from homepage/redesign2018/markdownExperiment/src/yaml/kontakt.subNav.yaml
rename to homepage/cwsvJudo/src/yaml/kontakt.subNav.yaml
diff --git a/homepage/redesign2018/markdownExperiment/src/yaml/links.subNav.yaml b/homepage/cwsvJudo/src/yaml/links.subNav.yaml
similarity index 100%
rename from homepage/redesign2018/markdownExperiment/src/yaml/links.subNav.yaml
rename to homepage/cwsvJudo/src/yaml/links.subNav.yaml
diff --git a/homepage/redesign2018/markdownExperiment/src/yaml/mainNav.yaml b/homepage/cwsvJudo/src/yaml/mainNav.yaml
similarity index 100%
rename from homepage/redesign2018/markdownExperiment/src/yaml/mainNav.yaml
rename to homepage/cwsvJudo/src/yaml/mainNav.yaml
diff --git a/homepage/redesign2018/markdownExperiment/src/yaml/navTargets.yaml b/homepage/cwsvJudo/src/yaml/navTargets.yaml
similarity index 96%
rename from homepage/redesign2018/markdownExperiment/src/yaml/navTargets.yaml
rename to homepage/cwsvJudo/src/yaml/navTargets.yaml
index 827181a..785576b 100644
--- a/homepage/redesign2018/markdownExperiment/src/yaml/navTargets.yaml
+++ b/homepage/cwsvJudo/src/yaml/navTargets.yaml
@@ -25,7 +25,7 @@ wkKalender: &wkKalender
 wkParticipo: &wkParticipo
 	caption: "Wettkampf&shy;planer"
 	icon: *iconPlanner
-	url: "http://cwsvjudo.bplaced.net/pages/desktop/wkParticipo"
+	url: "http://cwsvjudo.bplaced.net/participo"
 galerien: &galerien
 	caption: "Galerien"
 	url: "/galerien"
diff --git a/homepage/redesign2018/markdownExperiment/src/yaml/news.subNav.yaml b/homepage/cwsvJudo/src/yaml/news.subNav.yaml
similarity index 100%
rename from homepage/redesign2018/markdownExperiment/src/yaml/news.subNav.yaml
rename to homepage/cwsvJudo/src/yaml/news.subNav.yaml
diff --git a/homepage/redesign2018/markdownExperiment/src/yaml/quiz.subNav.yaml b/homepage/cwsvJudo/src/yaml/quiz.subNav.yaml
similarity index 100%
rename from homepage/redesign2018/markdownExperiment/src/yaml/quiz.subNav.yaml
rename to homepage/cwsvJudo/src/yaml/quiz.subNav.yaml
diff --git a/homepage/redesign2018/markdownExperiment/src/yaml/trainingszeiten.subNav.yaml b/homepage/cwsvJudo/src/yaml/trainingszeiten.subNav.yaml
similarity index 100%
rename from homepage/redesign2018/markdownExperiment/src/yaml/trainingszeiten.subNav.yaml
rename to homepage/cwsvJudo/src/yaml/trainingszeiten.subNav.yaml
diff --git a/homepage/redesign2018/markdownExperiment/src/yaml/verein.subNav.yaml b/homepage/cwsvJudo/src/yaml/verein.subNav.yaml
similarity index 100%
rename from homepage/redesign2018/markdownExperiment/src/yaml/verein.subNav.yaml
rename to homepage/cwsvJudo/src/yaml/verein.subNav.yaml
diff --git a/homepage/redesign2018/markdownExperiment/src/yaml/wkKalender.subNav.yaml b/homepage/cwsvJudo/src/yaml/wkKalender.subNav.yaml
similarity index 100%
rename from homepage/redesign2018/markdownExperiment/src/yaml/wkKalender.subNav.yaml
rename to homepage/cwsvJudo/src/yaml/wkKalender.subNav.yaml
diff --git a/homepage/redesign2018/markdownExperiment/tools/yamlMerge.py b/homepage/cwsvJudo/tools/yamlMerge.py
similarity index 100%
rename from homepage/redesign2018/markdownExperiment/tools/yamlMerge.py
rename to homepage/cwsvJudo/tools/yamlMerge.py
diff --git a/homepage/redesign2018/markdownExperiment/wkParticipo/lib/wkParticipo-user.php b/homepage/cwsvJudo/wkParticipo/lib/wkParticipo-user.php
similarity index 100%
rename from homepage/redesign2018/markdownExperiment/wkParticipo/lib/wkParticipo-user.php
rename to homepage/cwsvJudo/wkParticipo/lib/wkParticipo-user.php
diff --git a/homepage/redesign2018/markdownExperiment/wkParticipo/lib/wkParticipoLib.php.inc b/homepage/cwsvJudo/wkParticipo/lib/wkParticipoLib.php.inc
similarity index 100%
rename from homepage/redesign2018/markdownExperiment/wkParticipo/lib/wkParticipoLib.php.inc
rename to homepage/cwsvJudo/wkParticipo/lib/wkParticipoLib.php.inc
diff --git a/homepage/redesign2018/markdownExperiment/wkParticipo/test.php b/homepage/cwsvJudo/wkParticipo/test.php
similarity index 100%
rename from homepage/redesign2018/markdownExperiment/wkParticipo/test.php
rename to homepage/cwsvJudo/wkParticipo/test.php
diff --git a/homepage/machs/images.d/unterarmstuetz.jpg b/homepage/machs/images.d/unterarmstuetz.jpg
new file mode 100644
index 0000000..ba3537d
Binary files /dev/null and b/homepage/machs/images.d/unterarmstuetz.jpg differ
diff --git a/homepage/machs/images.d/wandsitzen.jpg b/homepage/machs/images.d/wandsitzen.jpg
new file mode 100644
index 0000000..f752c09
Binary files /dev/null and b/homepage/machs/images.d/wandsitzen.jpg differ
diff --git a/homepage/machs/index.php b/homepage/machs/index.php
index f657d9c..2b946a9 100644
--- a/homepage/machs/index.php
+++ b/homepage/machs/index.php
@@ -8,30 +8,22 @@ setlocale (LC_ALL, 'de_DE@euro', 'de_DE', 'de', 'ge');
 	require_once("./lib/db.php");
 	require_once("./lib/achievementsLib.php");
 	require_once("./lib/api.php");
-
-$dbConnection = getPdoDbConnection(
-	$cwsvJudoConfig["db"]["host"],
-	$cwsvJudoConfig["db"]["name"],
-	$cwsvJudoConfig["db"]["user"],
-	$cwsvJudoConfig["db"]["password"]
-);
-	require_once("./auth.php");
+	require_once("./lib/machs/achievementGroup.php");
 
 	$basePath = "/users/cwsvjudo/www";
 	require_once($basePath."/config/cwsvJudo.config.php");
 	require_once($basePath."/config/phpcount.config.php");
-//	require_once($basePath."/ressourcen/phpLib/phpcount/phpcount.php");
-//	require_once($basePath."/ressourcen/phpLib/cwsvJudo/miscAssis.php");
 
-//	$dbConnection = getCwsvJudoDbConn();
 	$dbConnection = getPdoDbConnection(
 		$cwsvJudoConfig["db"]["host"], 
 		$cwsvJudoConfig["db"]["name"], 
 		$cwsvJudoConfig["db"]["user"],
 		$cwsvJudoConfig["db"]["password"]
 	);
+	require_once("./auth.php");
 
-$achievementGroups = getAchievementGroups($dbConnection);
+	achievementGroup::setDbConnection($dbConnection);
+	$achievementGroups = achievementGroup::getAllAchievementGroups();
 
 processPostData($dbConnection, $_POST);
 
@@ -43,9 +35,9 @@ processPostData($dbConnection, $_POST);
 		<meta name="viewport" content="width=device-width, initial-scale=1.0" />
 
 		<!-- Compiled and minified CSS -->
-    <link rel="stylesheet" href="https://cdn.jsdelivr.net/npm/@materializecss/materialize@1.1.0-alpha/dist/css/materialize.min.css">
-    <!-- Compiled and minified JavaScript -->
-    <script src="https://cdn.jsdelivr.net/npm/@materializecss/materialize@1.1.0-alpha/dist/js/materialize.min.js"></script>
+		<link rel="stylesheet" href="https://cdn.jsdelivr.net/npm/@materializecss/materialize@1.1.0-alpha/dist/css/materialize.min.css">
+		<!-- Compiled and minified JavaScript -->
+		<script src="https://cdn.jsdelivr.net/npm/@materializecss/materialize@1.1.0-alpha/dist/js/materialize.min.js"></script>
 
 		<!-- inits for the materializeCss -->
 		<?php include("lib/machs/materializeInit.php");?>
@@ -58,12 +50,32 @@ processPostData($dbConnection, $_POST);
 
 	</head>
 	<body>
-		<?php echo $login_status; ?>
+		<?php include("lib/machs/sidenav.php");?>
+		
+<?php // Für die 12-Nächte-Challenge
+    $now = new DateTime();
+    $promoStart = new DateTime("2021-11-24");
+    $promoEnd = new DateTime("2022-02-06");
+	$from = new DateTime("2021-12-24");
+
+    if($promoStart <= $now && $now <= $promoEnd) {
+		echo("<h1 style=\"font-size:1.5rem;\">12-Nächte-Challenge</h1>");
+		if($now < $from) echo("<p>Die 12-Nächte-Challenge geht vom 24.12.2021--06.01.2022. Ziel ist es möglichts an allen Tagen ein Achievement zu erhalten. Sobald es losgeht, wird hier die aktuelle Rangliste stehen.");
+		record::setDbConnection($dbConnection);
+		$zwölfer = record::getTopAchievers(array('from'=>"2021-12-24", 'to'=>"2022-01-06"));
+		echo("<table>");
+		record::setDbConnection($dbConnection);
+		foreach( record::getTopAchievers(array('from'=>"2021-12-24", 'to'=>"2022-01-06")) as $t ){
+			echo("<tr><td>".$t['vorname']."</td><td>".$t['name']."</td><td>".$t['COUNT(*)']."</td></tr>");
+		}
+		echo("</table>");
+	}
+?>
 		
 		<?php
 		if( hasUserAttribute($dbConnection, $_SESSION['user']['userId'], "inTraining" ) ){
 			echo( "<h2>Eigene Achievements</h2>" );
-			echo( htmlUsersUploadBox($dbConnection, $_SESSION['user']['userId']) );
+			// echo( htmlUsersUploadBox($dbConnection, $_SESSION['user']['userId']) );
 			echo(htmlAchievementListForUser(
 				$dbConnection, 
 				$achievementGroups, 
@@ -78,7 +90,7 @@ processPostData($dbConnection, $_POST);
 			foreach($usersKids as $k){
 				if( hasUserAttribute($dbConnection, $k['kidId'], "inTraining" ) and ($k['kidId']!=$_SESSION['user']['userId']) ){
 					echo( "<h2>".$k['vorname']." ".$k['name']."</h2>" );
-					echo( htmlUsersUploadBox($dbConnection, $k['kidId']) );
+					// echo( htmlUsersUploadBox($dbConnection, $k['kidId']) );
 					echo(htmlAchievementListForUser(
 						$dbConnection, 
 						$achievementGroups, 
@@ -100,9 +112,11 @@ processPostData($dbConnection, $_POST);
 			echo( htmlUpdateAchievementBox(
 				$a['id'],
 				$a['name'], 
-				$a['description'], 
 				$a['rootId'], 
-				$a['level']
+				$a['achievementGroupId'],
+				$a['level'],
+				$a['description'], 
+				$a['imgUrl']
 			));
 			echo("<hr />");
 		}
diff --git a/homepage/machs/lib/achievementsLib.php b/homepage/machs/lib/achievementsLib.php
index 10b50e9..3e2a86c 100644
--- a/homepage/machs/lib/achievementsLib.php
+++ b/homepage/machs/lib/achievementsLib.php
@@ -141,7 +141,7 @@ return $html;
 }
 
 function htmlAchievementListForUser($db, $achievementGroups, $userId, $usersAchievmentIds, $noForm=false){
-//var_dump($db, $achievementGroups, $userId, $usersAchievmentIds);
+// var_dump($db, $achievementGroups, $userId, $usersAchievmentIds);
 $ids=[];
 foreach($usersAchievmentIds as $a){
 	$ids[]=$a['achievementId'];
@@ -154,12 +154,16 @@ $retHtml = "";
 	}
 	$retHtml .= "<div class=\"row\">";
 	foreach($achievementGroups as $g){
-		$records = record::getGroupsRecords($g->getId(), record::birthday2ageClass($userData[0]['gebDatum']));
+		$records = (
+			($userData[0]['gebDatum']!=null)?
+			(record::getGroupsRecords($g->getId(), record::birthday2ageClass($userData[0]['gebDatum']))):
+			[]
+		);
 		$retHtml .= "<div class=\"col s12 m6 l4 xl3\">";
 		$retHtml .= "<ul class=\"card\">";
 // see, if there is a record for this group
 		$imgUrl = null;
-		foreach($g->achievements as $a){
+		foreach($g->getAchievements() as $a){
 			if($a['imgUrl'] != null){
 				$imgUrl = $a['imgUrl'];
 			}
@@ -256,6 +260,8 @@ $html = "";
 	$html .= "<input style=\"width:100%;display:block;\" name=\"level\" type=\"text\" value=\"".$level."\"/>";
 	$html .= "<label for=\"description\">description</label>";
 	$html .= "<input style=\"width:100%;display:block;\" name=\"description\" type=\"textarea\" value=\"".$description."\"/>";
+	$html .= "<label for=\"imgUrl\">imgUrl</label>";
+	$html .= "<input style=\"width:100%;display:block;\" name=\"imgUrl\" type=\"text\" value=\"".$imgUrl."\"/>";
 	$html .= "<input type=\"submit\"/>";
 	$html .= "</form>";
 return $html;
diff --git a/homepage/machs/lib/db.php b/homepage/machs/lib/db.php
index 059ce33..9a1717e 100644
--- a/homepage/machs/lib/db.php
+++ b/homepage/machs/lib/db.php
@@ -10,6 +10,7 @@ function getPdoDbConnection($hostname, $dbName, $user, $password){
 	}
 	catch(PDOException $dbError){
 		echo( "Error whilst getting a dbConnection!: " . $dbError->getMessage() );
+		var_dump($hostname, $dbName, $user, $password);
 	}
 return $dbConnection;
 }
@@ -64,9 +65,7 @@ if( empty($someOptions['dontFetch' ]) ) $someOptions['dontFetch' ] = false;
 		if(!$pdoResult){
 			echo("Error during dbQuery!\n");
 			echo("DB-Error:\n"); var_dump($aDbConnection->errorInfo());
-//			var_dump($aQueryString);
-//			var_dump($aBindArray);
-//			echo($pdoStatement.errorInfo());
+
 		}
 		if($someOptions['dontFetch']){
 			$ret = NULL;
@@ -91,9 +90,6 @@ if( empty($someOptions['dontFetch' ]) ) $someOptions['dontFetch' ] = false;
 			);
 		}
 	}
-//var_dump($ret);
-//var_dump($aQueryString);
-//var_dump($aBindArray);
 return $ret;
 }
 
@@ -193,6 +189,7 @@ SQL;
 return $result;
 }
 
+/// @brief Get all members, the user has 'vormundschaft' to
 function getUsersKids($db, $userId){
 	$query = <<<SQL
 SELECT * 
diff --git a/homepage/machs/lib/record.php b/homepage/machs/lib/record.php
index 6cb5dbe..01f5f13 100644
--- a/homepage/machs/lib/record.php
+++ b/homepage/machs/lib/record.php
@@ -33,14 +33,19 @@ class record{
 	}
 	
 	public static function getTopAchievers($options=array()){
-		$query = <<<SQL
-SELECT `wkParticipo_Users`.`vorname`, `wkParticipo_Users`.`name`, COUNT(*) 
-FROM `achievements<=>user` 
-JOIN `wkParticipo_Users` 
-  ON `wkParticipo_Users`.`id` = `achievements<=>user`.`userId` 
-GROUP BY `wkParticipo_Users`.`id` 
-ORDER BY `COUNT(*)` DESC;
-SQL;
+		$from = array_key_exists('from',$options)?$options['from']:null;
+		$to = array_key_exists('to',$options)?$options['to']:null;
+		$query =
+			"SELECT `wkParticipo_Users`.`vorname`, `wkParticipo_Users`.`name`, COUNT(*) ".
+			"FROM `achievements<=>user` JOIN `wkParticipo_Users` ".
+			"ON `wkParticipo_Users`.`id` = `achievements<=>user`.`userId` ".
+			(
+				($from!=null&&$to!=null)?
+				("BETWEEN CONVERT(\"".$from."\", datetime) AND CONVERT(\"".$to."\", datetime) "):
+				("")
+			).
+			"GROUP BY `wkParticipo_Users`.`id` ".
+			"ORDER BY `COUNT(*)` DESC;";
 	return dbQuery(self::$db, $query);
 	}
 	
@@ -100,8 +105,9 @@ SQL;
 		$retHtml.=     "Die Rekorde der jüngeren gelten auch für die älteren, aber nicht umgekehrt. ";
 		$retHtml.=     "Damit ein Rekord auch eingetragen wird, muss er mit einem Nachweis in Videoform gemeldet werden.";
 		$retHtml.=     "<h4>Rekord melden</h4>";
-		$retHtml.=     "Um einen Rekord zu melden, lade ein Video des Rekordes hoch:";
-		$retHtml.=     htmlUsersUploadBox(self::$db, $u['id']);
+		$retHtml.=     "Um einen Rekord zu melden, schickt als Nachweis ein Video des Rekordes hoch an <a href=\"mailto:cwsvJudo@arcor.de\">cwsvJudo@arcor.de</a>.";
+		// $retHtml.=     "Um einen Rekord zu melden, lade ein Video des Rekordes hoch:";
+		// $retHtml.=     htmlUsersUploadBox(self::$db, $u['id']);
 		$retHtml.=     "<strong>Anschließend</strong> kannst Du den Rekord melden:";
 		$retHtml.=     "<form action=\".\" method=\"POST\">";
 		if(isUserAdmin(record::$db, $_SESSION['user']['userId'])){
@@ -121,12 +127,12 @@ SQL;
 			$retHtml.=      "<input id=\"submit\" style=\"width:100%\" name=\"submit\" type=\"submit\" value=\"Rekord melden\">";
 		}
 		$retHtml.=     "</form>";
+		$retHtml.=     "<p>Sobald das Nachweisvideo gesichtet ist und es eine neue Bestleistung darstellt, wird der Rekord dann eingetragen und damit offiziell.</p>";
 		$retHtml.=    "</div>";
 		$retHtml.=    "<div class=\"modal-footer\">";
 		$retHtml.=     "<a href=\"#!\" class=\"modal-close waves-effect waves-green btn-flat\">Zurück</a>";
 		$retHtml.=    "</div>";
 		$retHtml.=   "</div>";
-//		$retHtml.=  "</div>";
 	return $retHtml;
 	}
 	
@@ -160,7 +166,7 @@ COLLAPSIBLE;
 		$group->loadAchievementGroupFromDb($gid);
 		
 		$retHtml.= "";
-		var_dump($group->canHaveRecords());
+		// var_dump($group->canHaveRecords());
 		if($group->canHaveRecords()){
 			$retHtml = "<".$frameTag." class=\"card\">";
 			$retHtml.=  "<div class=\"card-content\">";
diff --git a/homepage/machs/records.php b/homepage/machs/records.php
index f25e162..b005f2c 100644
--- a/homepage/machs/records.php
+++ b/homepage/machs/records.php
@@ -17,10 +17,7 @@ setlocale (LC_ALL, 'de_DE@euro', 'de_DE', 'de', 'ge');
 	require_once($basePath."/config/cwsvJudo.config.php");
 	require_once($basePath."/config/phpcount.config.php");
 	require_once($basePath."/ressourcen/phpLib/phpcount/phpcount.php");
-		PHPCount::AddHit("Achievementsystem (".htmlspecialchars($_SESSION['user']['username']).")");
-//	require_once($basePath."/ressourcen/phpLib/cwsvJudo/miscAssis.php");
 
-//	$dbConnection = getCwsvJudoDbConn();
 	$dbConnection = getPdoDbConnection(
 		$cwsvJudoConfig["db"]["host"], 
 		$cwsvJudoConfig["db"]["name"], 
diff --git a/homepage/machs/setUserData.php b/homepage/machs/setUserData.php
index 5ac43cd..3bbc4d5 100644
--- a/homepage/machs/setUserData.php
+++ b/homepage/machs/setUserData.php
@@ -15,12 +15,7 @@ setlocale (LC_ALL, 'de_DE@euro', 'de_DE', 'de', 'ge');
 
 	$basePath = "/users/cwsvjudo/www";
 	require_once($basePath."/config/cwsvJudo.config.php");
-	require_once($basePath."/config/phpcount.config.php");
-	require_once($basePath."/ressourcen/phpLib/phpcount/phpcount.php");
-		PHPCount::AddHit("Achievementsystem setUserData(".htmlspecialchars($_SESSION['user']['username']).")");
-//	require_once($basePath."/ressourcen/phpLib/cwsvJudo/miscAssis.php");
 
-//	$dbConnection = getCwsvJudoDbConn();
 	$dbConnection = getPdoDbConnection(
 		$cwsvJudoConfig["db"]["host"], 
 		$cwsvJudoConfig["db"]["name"], 
@@ -66,7 +61,7 @@ processPostData($dbConnection, $_POST);
 		foreach($usersKids as $k){
 			if( hasUserAttribute($dbConnection, $k['kidId'], "inTraining" ) ){
 				echo( "<h2 >".$k['vorname']." ".$k['name']."</h2>" );
-				echo( htmlUsersUploadBox($dbConnection, $_SESSION['user']['userId']) );
+				// echo( htmlUsersUploadBox($dbConnection, $k['kidId']) );
 				echo( setUserDataBox($k['kidId']) );
 			}
 		}
diff --git a/homepage/mams/index.php b/homepage/mams/index.php
index 63bfa03..7d91c20 100644
--- a/homepage/mams/index.php
+++ b/homepage/mams/index.php
@@ -1,4 +1,6 @@
 <?php
+	setlocale (LC_ALL, 'de_DE@euro', 'de_DE', 'de', 'ge');
+	
 	require_once("./local/cwsvJudo.config.php");
 	require_once("./lib/db.php");
 	require_once("./lib/api.php");
@@ -23,11 +25,11 @@
 		array_push( $lastAttendancesAssocArray[ $a['date'] ], $a );
 	}
 
-	$dateLastWendsday = new DateTime("tomorrow last wednesday");
-	$dateLastFriday = new DateTime("tomorrow  last friday");
+	$dateLastWendsday = new DateTime("wednesday this week");
+	$dateLastFriday = new DateTime("friday this week");
 	$lastTrainingDay = max($dateLastWendsday, $dateLastFriday);
 ?>
-<html>
+<html lang="de">
 	<header>
 		<!-- Compiled and minified CSS -->
 		<link rel="stylesheet" href="https://cdn.jsdelivr.net/npm/@materializecss/materialize@1.1.0-alpha/dist/css/materialize.min.css">
@@ -48,7 +50,7 @@
 		<form action="./index.php" method="POST">
 			<div class="input-field">
 				<input id="giveAttendanceAction" name="action" value="giveAttendance" type="hidden" />
-				<input id="attendenceDate" name="attandanceDate" value="<?php echo($lastTrainingDay->format("Y-m-d"));?>" />
+				<input id="attendenceDate" name="attandanceDate" value="<?php echo($lastTrainingDay->format("Y-m-d"));?>" type="text" class="datepicker"/>
 				<select name="judokaIdsInTraining[]" id="judokaIdsInTraining" multiple><option value="" disabled selected>Anwesende auswählen</option>
 					<?php foreach($judokas as $j) echo("<option value=\"".$j['userId']."\">".$j['vorname']." ".$j['name']."</option>");?>
 				</select>
@@ -86,7 +88,7 @@
 		</form>
 		<?php foreach($lastAttendancesAssocArray as $date => $attendees){
 			echo("<h3>".$date."</h3>");
-			echo("<table border=\"1\">");
+			echo("<table class=\"responsive-table striped\" border=\"1\">");
 			echo("<tr>");
 			echo("<th>name</th>");
 			echo("<th>vorname</th>");
@@ -98,9 +100,9 @@
 				echo("<tr>");
 				echo("<td>".$a['name']."</td>");
 				echo("<td>".$a['vorname']."</td>");
-				echo("<td>".( $a['corona_PLZ'] ?      $a['corona_PLZ']      : "<form action=\".\" method=\"POST\"><input name=\"action\" value =\"updateCoronaData\" type=\"hidden\" /><input name=\"columnName\" value=\"corona_PLZ\"      type=\"hidden\" /><input name=\"userId\" value=\"".$a['userId']."\" type=\"hidden\" /><input name=\"columnValue\" type=\"text\" placeholder=\"PLZ\"       /><input type=\"submit\" value=\"Submit\"></form>")."</td>");
+				echo("<td>".( $a['corona_PLZ']      ? $a['corona_PLZ']      : "<form action=\".\" method=\"POST\"><input name=\"action\" value =\"updateCoronaData\" type=\"hidden\" /><input name=\"columnName\" value=\"corona_PLZ\"      type=\"hidden\" /><input name=\"userId\" value=\"".$a['userId']."\" type=\"hidden\" /><input name=\"columnValue\" type=\"text\" placeholder=\"PLZ\"       /><input type=\"submit\" value=\"Submit\"></form>")."</td>");
 				echo("<td>".( $a['corona_telephon'] ? $a['corona_telephon'] : "<form action=\".\" method=\"POST\"><input name=\"action\" value =\"updateCoronaData\" type=\"hidden\" /><input name=\"columnName\" value=\"corona_telephon\" type=\"hidden\" /><input name=\"userId\" value=\"".$a['userId']."\" type=\"hidden\" /><input name=\"columnValue\" type=\"text\" placeholder=\"Telephpon\" /><input type=\"submit\" value=\"Submit\"></form>")."</td>");
-				echo("<td>".( $a['corona_eMail'] ?    $a['corona_eMail']    : "<form action=\".\" method=\"POST\"><input name=\"action\" value =\"updateCoronaData\" type=\"hidden\" /><input name=\"columnName\" value=\"corona_eMail\"    type=\"hidden\" /><input name=\"userId\" value=\"".$a['userId']."\" type=\"hidden\" /><input name=\"columnValue\" type=\"text\" placeholder=\"eMail\"     /><input type=\"submit\" value=\"Submit\"></form>")."</td>");
+				echo("<td>".( $a['corona_eMail']    ? $a['corona_eMail']    : "<form action=\".\" method=\"POST\"><input name=\"action\" value =\"updateCoronaData\" type=\"hidden\" /><input name=\"columnName\" value=\"corona_eMail\"    type=\"hidden\" /><input name=\"userId\" value=\"".$a['userId']."\" type=\"hidden\" /><input name=\"columnValue\" type=\"text\" placeholder=\"eMail\"     /><input type=\"submit\" value=\"Submit\"></form>")."</td>");
 				echo("</tr>");
 			}
 			echo("</table>");
diff --git a/homepage/mams/lib/api.php b/homepage/mams/lib/api.php
index 6cd3bdf..08d2ac4 100644
--- a/homepage/mams/lib/api.php
+++ b/homepage/mams/lib/api.php
@@ -17,8 +17,6 @@ function processPostData($db, $post, $redirectLocation = "."){
 				&& isValid($post['corona_PLZ'], "plz")
 				&& isValid($post['corona_telephon'], "phonenumber")
 				&& isValid($post['corona_eMail'], "email")
-				// && isValid($post['name'], "name")
-				// && isValid($post['vorname'], "name")
 				){
 				addCoronaUser(
 					$db,
diff --git a/homepage/mams/lib/mams/materializeInit.php b/homepage/mams/lib/mams/materializeInit.php
index 62f5524..5d73dfe 100644
--- a/homepage/mams/lib/mams/materializeInit.php
+++ b/homepage/mams/lib/mams/materializeInit.php
@@ -8,4 +8,8 @@
 			var sideNavElems = document.querySelectorAll('.sidenav');
 			var sideNavInstances = M.Sidenav.init(sideNavElems, options);
 		});
+		document.addEventListener('DOMContentLoaded', function() {
+			var elems = document.querySelectorAll('.datepicker');
+			var instances = M.Datepicker.init(elems, options);
+		});
 </script>
diff --git a/homepage/materialize b/homepage/materialize
deleted file mode 160000
index 9363a94..0000000
--- a/homepage/materialize
+++ /dev/null
@@ -1 +0,0 @@
-Subproject commit 9363a94a0000933bcef127f18d39c792d229d7de
diff --git a/homepage/participo/.htaccess b/homepage/participo/.htaccess
new file mode 100644
index 0000000..362484a
--- /dev/null
+++ b/homepage/participo/.htaccess
@@ -0,0 +1,7 @@
+# Url-Rewriting aktivieren
+RewriteEngine on
+# Wenn * angefordert wurde und *.php existiert
+RewriteCond %{REQUEST_FILENAME}.php -f
+# Hänge ein \.php an
+RewriteRule ^(.*)$ $1\.php
+
diff --git a/homepage/participo/auth.php b/homepage/participo/auth.php
new file mode 100644
index 0000000..c25f3a6
--- /dev/null
+++ b/homepage/participo/auth.php
@@ -0,0 +1,16 @@
+<?php
+session_start();
+	// Falls der serverseitige Logincookie nicht gesetzt ist, 
+	// leite zur loginSeite weiter
+ 	if (empty($_SESSION['login'])) {
+		header('Location: login', TRUE, 301);
+		exit;
+	} else {
+		$login_status = 
+			"<div style=\"border: 1px solid black\">".
+				"Datum: ".date("Y-m-d")."<br />".
+				"Angemeldet als <strong>".htmlspecialchars($_SESSION['user']['username'])."</strong>.<br />".
+				"<a href=\"logout.php\">Sitzung beenden</a>".
+			"</div>";
+	}
+?>
diff --git a/homepage/participo/config/participo.php b/homepage/participo/config/participo.php
new file mode 100644
index 0000000..d3b7012
--- /dev/null
+++ b/homepage/participo/config/participo.php
@@ -0,0 +1,8 @@
+<?php
+/// @file some variable definitions
+
+$config['basePath'] = "/users/cwsvjudo/www";
+$config['baseUrl'] = "http://cwsvjudo.bplaced.net";
+$config['ressourceUrl'] = "http://cwsvjudo.bplaced.net/ressourcen";
+
+?>
diff --git a/homepage/participo/css/parsedownCard.css b/homepage/participo/css/parsedownCard.css
new file mode 100644
index 0000000..945803f
--- /dev/null
+++ b/homepage/participo/css/parsedownCard.css
@@ -0,0 +1,9 @@
+.parsedownCard h1{
+    font-size: 2.0rem;
+}
+.parsedownCard h2{
+    font-size: 1.75rem;
+}
+.parsedownCard ul li {
+    list-style-type: disc;
+}
\ No newline at end of file
diff --git a/homepage/participo/css/participo.css b/homepage/participo/css/participo.css
new file mode 100644
index 0000000..abe6b04
--- /dev/null
+++ b/homepage/participo/css/participo.css
@@ -0,0 +1,11 @@
+/*
+on large screens add a padding on the left for the fixed sidnav
+*/
+header, main, footer {
+	padding-left: 300px;
+	}
+@media only screen and (max-width : 992px) {
+	header, main, footer {
+		padding-left: 0;
+	}
+}
diff --git a/homepage/participo/images/account.svg b/homepage/participo/images/account.svg
new file mode 100644
index 0000000..db6c35d
--- /dev/null
+++ b/homepage/participo/images/account.svg
@@ -0,0 +1,66 @@
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<!-- Created with Inkscape (http://www.inkscape.org/) -->
+
+<svg
+   xmlns:dc="http://purl.org/dc/elements/1.1/"
+   xmlns:cc="http://creativecommons.org/ns#"
+   xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
+   xmlns:svg="http://www.w3.org/2000/svg"
+   xmlns="http://www.w3.org/2000/svg"
+   xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd"
+   xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape"
+   version="1.1"
+   id="svg2"
+   xml:space="preserve"
+   width="6666.6665"
+   height="6666.6665"
+   viewBox="0 0 6666.6665 6666.6665"
+   sodipodi:docname="account.svg"
+   inkscape:version="0.92.4 (5da689c313, 2019-01-14)"><metadata
+     id="metadata8"><rdf:RDF><cc:Work
+         rdf:about=""><dc:format>image/svg+xml</dc:format><dc:type
+           rdf:resource="http://purl.org/dc/dcmitype/StillImage" /><dc:title></dc:title></cc:Work></rdf:RDF></metadata><defs
+     id="defs6"><clipPath
+       clipPathUnits="userSpaceOnUse"
+       id="clipPath18"><path
+         d="M 0,5000 H 5000 V 0 H 0 Z"
+         id="path16"
+         inkscape:connector-curvature="0" /></clipPath></defs><sodipodi:namedview
+     pagecolor="#ffffff"
+     bordercolor="#666666"
+     borderopacity="1"
+     objecttolerance="10"
+     gridtolerance="10"
+     guidetolerance="10"
+     inkscape:pageopacity="0"
+     inkscape:pageshadow="2"
+     inkscape:window-width="640"
+     inkscape:window-height="480"
+     id="namedview4"
+     showgrid="false"
+     inkscape:zoom="0.035400001"
+     inkscape:cx="3333.3333"
+     inkscape:cy="3333.3333"
+     inkscape:window-x="288"
+     inkscape:window-y="113"
+     inkscape:window-maximized="0"
+     inkscape:current-layer="g10" /><g
+     id="g10"
+     inkscape:groupmode="layer"
+     inkscape:label="account-6491185"
+     transform="matrix(1.3333333,0,0,-1.3333333,0,6666.6667)"><g
+       id="g12"><g
+         id="g14"
+         clip-path="url(#clipPath18)"><g
+           id="g20"
+           transform="translate(3839.9414,1190.9668)"><path
+             d="m 0,0 c -368.75,292.187 -832.91,468.994 -1339.941,468.994 -507.056,0 -971.192,-176.807 -1339.917,-468.994 -330.494,338.232 -535.083,799.951 -535.083,1309.033 0,1033.887 841.113,1875 1875,1875 1033.886,0 1875,-841.113 1875,-1875 C 535.059,799.951 330.469,338.232 0,0 m -1339.941,-565.967 c -386.89,0 -746.729,117.871 -1045.655,319.483 294.532,213.183 655.078,340.478 1045.655,340.478 390.576,0 751.123,-127.246 1045.703,-340.478 -298.975,-201.612 -658.789,-319.483 -1045.703,-319.483 m 0,4125 c -1242.627,0 -2250,-1007.348 -2250,-2250 0,-1242.627 1007.373,-2250 2250,-2250 1242.627,0 2250,1007.373 2250,2250 0,1242.652 -1007.373,2250 -2250,2250"
+             style="fill:#000000;fill-opacity:1;fill-rule:nonzero;stroke:none"
+             id="path22"
+             inkscape:connector-curvature="0" /></g><g
+           id="g24"
+           transform="translate(2500,2125)"><path
+             d="M 0,0 C -310.156,0 -562.5,252.344 -562.5,562.5 -562.5,872.656 -310.156,1125 0,1125 310.156,1125 562.5,872.656 562.5,562.5 562.5,252.344 310.156,0 0,0 M 0,1500 C -517.773,1500 -937.5,1080.273 -937.5,562.5 -937.5,44.727 -517.773,-375 0,-375 517.773,-375 937.5,44.727 937.5,562.5 937.5,1080.273 517.773,1500 0,1500"
+             style="fill:#000000;fill-opacity:1;fill-rule:nonzero;stroke:none"
+             id="path26"
+             inkscape:connector-curvature="0" /></g></g></g></g></svg>
\ No newline at end of file
diff --git a/homepage/participo/images/info.svg b/homepage/participo/images/info.svg
new file mode 100644
index 0000000..2356748
--- /dev/null
+++ b/homepage/participo/images/info.svg
@@ -0,0 +1,21 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<svg viewBox="0 0 744.09447 1052.362179" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink">
+ <defs>
+  <linearGradient id="b">
+   <stop stop-color="#1f55d1" offset="0"/>
+   <stop stop-color="#c9daff" offset="1"/>
+  </linearGradient>
+  <linearGradient id="a" xlink:href="#b"/>
+  <radialGradient id="c" cx=".65278" cy=".67832" r="1.8433" fx=".67361" fy=".66434" xlink:href="#b"/>
+ </defs>
+ <path transform="translate(1.039 -1.7757)" d="m523.75 510.49a190.62 190.62 0 1 0 -381.25 0 190.62 190.62 0 1 0 381.25 0z" fill="url(#c)" fill-rule="evenodd" stroke="url(#a)" stroke-width="8"/>
+ <path transform="translate(32.914 40.099)" d="m445 468.61a143.75 143.75 0 1 0 -287.5 0 143.75 143.75 0 1 0 287.5 0z" fill="#fff" fill-rule="evenodd" stroke="url(#a)" stroke-width="8"/>
+ <path transform="scale(42.739 26.7)" d="m7.3966 17.236h1.0781v6.5625h-1.0781v-6.5625zm0-2.5547h1.0781v1.3594h-1.0781v-1.3594z" fill="#919191"/>
+ <text transform="scale(42.739 26.7)" x="6.15463" y="23.61115" font-family="Bitstream Vera Sans" font-size="12">
+  <tspan>i</tspan>
+ </text>
+ <path transform="scale(31.938 26.851)" d="m32.2376,17.8471c-.57544,1e-005-1.03034.22559-1.36468.67676s-.50153,1.06934-.50153,1.85449 .1662,1.40332.4986,1.85449 .78827.67676 1.36761.67676c.57153,0 1.02447-.22656 1.35883-.67969s.50152-1.07031.50153-1.85156-.16718-1.39355-.50153-1.84863-.7873-.68261-1.35883-.68262zm-.00293-.91406c.9375,1e-005 1.67382.30469 2.20898.91406s.80273,1.45313.80273,2.53125c-1e-005,1.07422-.26758,1.91699-.80273,2.52832s-1.27149.91699-2.20898.91699-1.67871-.30566-2.21191-.91699-.79981-1.4541-.7998-2.52832c0-1.07812.2666-1.92187.7998-2.53125s1.27051-.91406 2.21191-.91406zm-3.43359-2.39063v.89063h-1.02795c-.38794,1e-005-.65735.07838-.80823.23511s-.22632.43897-.22632.84668v.58227h1.78125v.84375h-1.78125v5.71875h-1.07813v-5.71875h-1.03125v-.84375h1.03125v-.4585c0-.72997.16974-1.26183.50922-1.59558s.87787-.5006 1.61517-.50061h1.01624zm-5.46094,5.14783v3.96936h-1.07813v-3.9342c0-.62011-.12171-1.08429-.36511-1.39252s-.60865-.46234-1.0957-.46234c-.58496,0-1.04633.18537-1.38409.55609s-.50666.87616-.50665,1.5163v3.71667h-1.07813v-6.5625h1.07813v1.00781c.25879-.39257.56372-.68603.91479-.88037s.75598-.2915 1.21472-.2915c.75683,1e-005 1.3294.23316 1.71771.69946s.58245,1.15223.58246,2.05774z" fill="#919191"/>
+ <text transform="scale(31.938 26.851)" x="16.58452" y="23.48566" font-family="Bitstream Vera Sans" font-size="12">
+  <tspan>nfo</tspan>
+ </text>
+</svg>
diff --git a/homepage/participo/images/mountain-climber.svg b/homepage/participo/images/mountain-climber.svg
new file mode 100644
index 0000000..6652a4c
--- /dev/null
+++ b/homepage/participo/images/mountain-climber.svg
@@ -0,0 +1,101 @@
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<svg
+   xmlns:dc="http://purl.org/dc/elements/1.1/"
+   xmlns:cc="http://creativecommons.org/ns#"
+   xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
+   xmlns:svg="http://www.w3.org/2000/svg"
+   xmlns="http://www.w3.org/2000/svg"
+   viewBox="0 0 682.74664 1154.4933"
+   height="1154.4933"
+   width="682.74664"
+   xml:space="preserve"
+   id="svg2"
+   version="1.1"><metadata
+     id="metadata8"><rdf:RDF><cc:Work
+         rdf:about=""><dc:format>image/svg+xml</dc:format><dc:type
+           rdf:resource="http://purl.org/dc/dcmitype/StillImage" /></cc:Work></rdf:RDF></metadata><defs
+     id="defs6"><clipPath
+       id="clipPath18"
+       clipPathUnits="userSpaceOnUse"><path
+         id="path16"
+         d="M 0,865.87 H 512.06 V 0 H 0 Z" /></clipPath></defs><g
+     transform="matrix(1.3333333,0,0,-1.3333333,0,1154.4933)"
+     id="g10"><g
+       id="g12"><g
+         clip-path="url(#clipPath18)"
+         id="g14"><g
+           transform="translate(402.91,613.5663)"
+           id="g20"><path
+             id="path22"
+             style="fill:#292929;fill-opacity:1;fill-rule:nonzero;stroke:none"
+             d="m 0,0 c 0,0 -3.632,-8.233 -7.021,-28.572 -3.391,-20.34 0.977,-19.984 -1.695,-46.49 -2.906,-28.814 -3.431,-35.071 -2.664,-49.151 0.727,-13.32 1.695,-17.193 -5.569,-20.099 -7.264,-2.906 -16.949,-11.139 -19.371,-20.339 -2.421,-9.201 -5.326,-17.918 -7.263,-20.824 -1.938,-2.905 0.06,-7.142 -1.938,-10.774 -1.998,-3.632 -2.724,-3.632 -5.266,-15.981 -2.542,-12.349 -7.083,-12.711 -7.446,-16.344 -0.363,-3.632 -5.205,-31.477 -16.828,-31.477 -11.623,0 -66.829,0 -79.42,-5.811 -12.591,-5.811 -23.244,-4.843 -15.012,-54.239 8.233,-49.395 6.296,-53.753 4.359,-61.985 -1.938,-8.233 -0.726,-15.498 -9.202,-23.488 -8.475,-7.99 -18.401,-23.728 -15.981,-27.845 2.421,-4.117 10.897,-1.695 20.824,6.779 9.928,8.476 12.833,12.592 16.707,15.497 3.874,2.906 5.569,0.243 14.528,4.601 8.959,4.358 9.444,11.623 2.905,17.192 -6.537,5.568 -7.505,6.295 -7.021,16.223 0.484,9.928 3.631,23.002 5.327,31.718 1.694,8.717 1.211,15.497 0.242,24.698 -0.969,9.201 -1.211,12.107 -1.211,12.107 0,0 7.022,1.936 11.381,-0.484 4.358,-2.422 13.316,-7.506 28.814,-9.201 15.496,-1.696 19.369,-0.243 19.369,-0.243 l 2.907,-2.663 c 0,0 -16.223,-31.235 -21.55,-47.216 -5.327,-15.981 -7.507,-22.519 -8.717,-30.509 -1.211,-7.99 2.663,-12.349 9.443,-21.307 6.78,-8.959 16.95,-38.5 20.097,-54.481 3.147,-15.98 3.632,-35.835 3.147,-36.804 -0.483,-0.968 -3.873,1.937 -3.389,-5.326 0.484,-7.265 -2.179,-11.866 -6.779,-23.003 -4.602,-11.138 -8.717,-24.214 0.968,-23.971 9.685,0.242 21.065,9.201 23.245,17.191 2.179,7.991 1.695,13.318 4.358,15.739 2.664,2.421 8.233,7.749 6.538,18.16 -1.695,10.411 -1.211,8.232 -0.484,13.559 0.726,5.328 -1.696,5.812 -3.874,3.39 l -2.18,-2.422 c 0,0 -0.726,18.645 -0.485,37.531 0.243,18.887 1.454,30.266 -8.231,42.858 -9.687,12.591 -8.959,17.192 -4.844,23.003 4.116,5.811 31.478,46.489 34.384,54.237 2.905,7.749 15.496,1.695 23.486,11.622 0,0 18.51,-21.993 25.909,-10.896 0.968,1.453 11.864,11.138 13.075,23.73 1.211,12.591 3.148,14.285 5.569,17.191 2.422,2.905 2.422,4.6 -1.937,7.99 -4.358,3.391 -22.761,20.822 -25.666,16.707 -2.906,-4.116 -3.893,-6.725 -4.359,-5.327 -0.484,1.453 -0.726,4.842 -2.905,13.56 -2.18,8.717 -5.327,10.654 -2.18,15.255 3.149,4.6 8.475,8.473 19.855,16.948 11.381,8.475 13.318,7.991 17.434,11.623 4.116,3.632 7.022,4.843 8.717,0.969 1.695,-3.875 8.959,-19.855 14.286,-32.931 5.327,-13.075 4.843,-8.958 7.022,-24.939 2.179,-15.981 9.685,-27.361 10.896,-36.32 1.211,-8.96 -0.969,-18.161 -0.727,-21.551 0.243,-3.39 0.485,-10.047 0.848,-15.495 0.363,-5.448 -0.545,-7.809 2.361,-7.264 2.905,0.544 4.539,2.361 4.358,7.083 -0.182,4.721 1.272,7.263 1.998,4.721 0.726,-2.543 3.631,-3.088 3.631,-12.53 0,-9.444 3.269,-8.172 4.359,-5.993 l 0.727,3.087 c 0,0 -0.727,-2.905 1.089,-3.45 1.816,-0.546 3.45,2.723 2.906,5.085 -0.545,2.359 0.943,-3.2 3.268,1.452 0.364,0.727 1.272,3.269 1.089,5.63 -0.18,2.36 1.635,-0.182 1.817,-2.179 0.182,-1.998 2.482,-1.515 2.24,1.513 -0.242,3.026 -1.332,9.02 -4.964,15.012 -3.632,5.993 -7.264,8.535 -7.264,12.531 0,3.995 -2.542,19.975 -3.451,30.145 -0.907,10.17 -7.264,33.596 -11.259,48.305 -3.995,14.711 -7.445,30.51 -8.535,42.495 -1.089,11.986 -0.363,14.71 -6.537,20.703 -6.175,5.992 -6.538,4.54 -7.628,8.535 -1.089,3.995 -4.903,9.443 -4.903,9.443 0,0 1.998,-3.632 10.351,-6.538 8.354,-2.905 10.352,-3.086 14.71,1.09 4.358,4.177 8.717,9.806 11.623,7.99 2.904,-1.815 5.629,-4.721 0.544,-12.53 -5.085,-7.808 -6.901,-22.337 -7.445,-35.049 -0.545,-12.712 3.632,-26.332 3.995,-30.69 0.363,-4.358 -0.182,-11.985 1.997,3.995 2.18,15.981 1.271,-4.177 1.09,-7.446 -0.181,-3.268 0.545,-1.453 1.453,3.814 0.908,5.266 -0.908,-11.441 0,-6.175 0.908,5.267 2.179,-10.532 3.268,-0.726 1.09,9.807 1.454,-4.177 2.725,1.634 1.271,5.812 2.905,-0.363 3.45,4.177 0.545,4.541 1.998,-1.998 2.723,2.906 0.727,4.903 1.272,2.542 1.817,6.174 0.545,3.633 0.363,-8.898 2.724,2.906 2.361,11.804 4.359,21.428 2.906,37.954 -1.453,16.526 -2.18,19.069 -4.177,23.245 -1.998,4.177 -7.991,7.627 -8.898,10.532 -0.909,2.906 3.268,14.711 1.633,24.88 -1.633,10.17 -7.99,17.253 -17.615,22.338 -9.624,5.084 -11.622,2.36 -15.98,1.997 -4.358,-0.364 -6.235,0.605 -8.656,1.815 -2.422,1.211 -5.812,3.147 -6.538,0.485 -0.726,-2.664 0.666,-2.935 0.666,-2.935 0,0 -5.993,0.635 -6.719,0.544 -0.727,-0.091 -1.816,0.091 -1.907,-1.18 -0.091,-1.272 -1.18,-0.091 -2.362,-0.818 -1.18,-0.726 -1.18,-1.725 -3.268,-1.725 -2.088,0 -8.444,-0.182 -7.173,-6.266 1.271,-6.083 2.633,-4.448 2.542,-9.896 -0.091,-5.448 -3.723,-15.254 -7.173,-15.708 -3.45,-0.455 -7.186,1.366 -5.357,8.685 3.148,12.592 -0.727,23.246 -3.874,33.899 -3.148,10.654 -3.874,26.876 -1.211,36.805 2.664,9.927 3.147,12.59 2.906,19.371 -0.242,6.779 3.148,41.888 1.695,50.363 -1.453,8.475 -3.39,8.959 -8.959,14.044 -5.569,5.086 -10.896,5.327 -10.896,5.327 0,0 1.937,-20.097 2.663,-25.182" /></g><g
+           transform="translate(290.9232,445.6469)"
+           id="g24"><path
+             id="path26"
+             style="fill:#ec363a;fill-opacity:1;fill-rule:nonzero;stroke:none"
+             d="m 0,0 c 0.363,-1.453 13.802,-21.792 17.434,-32.325 3.632,-10.533 -21.792,4.722 -28.33,10.896 -6.538,6.174 5.448,1.09 12.712,-5.085 7.264,-6.174 14.892,-8.353 8.354,2.18 C 3.633,-13.801 -2.906,-5.811 -2.906,-2.18 -2.906,1.453 -0.726,2.906 0,0" /></g><g
+           transform="translate(346.8568,380.997)"
+           id="g28"><path
+             id="path30"
+             style="fill:#ec363a;fill-opacity:1;fill-rule:nonzero;stroke:none"
+             d="m 0,0 c -1.09,0.726 -22.156,2.18 -26.514,-1.089 -4.358,-3.269 -6.901,-23.972 5.085,-39.953 11.986,-15.98 11.259,2.543 11.259,2.543 0,0 -9.807,19.25 -8.717,24.698 1.09,5.448 10.17,4.358 17.797,5.085 C 6.537,-7.99 0,0 0,0" /></g><g
+           transform="translate(324.0823,381.5082)"
+           id="g32"><path
+             id="path34"
+             style="fill:#ec363a;fill-opacity:1;fill-rule:nonzero;stroke:none"
+             d="m 0,0 c -0.17,-0.666 -0.637,-1.875 -1.856,-2.483 -0.448,-0.223 -0.937,-0.335 -1.455,-0.335 -1.821,0 -3.714,1.346 -4.713,3.351 -0.684,1.373 -0.882,2.924 -0.544,4.254 0.169,0.666 0.634,1.876 1.856,2.484 0.447,0.223 0.937,0.335 1.456,0.335 1.82,0 3.714,-1.345 4.711,-3.35 C 0.139,2.883 0.337,1.333 0,0 m 2.706,5.875 c -2.234,4.489 -7.177,6.57 -11.037,4.648 -3.861,-1.922 -5.179,-7.12 -2.944,-11.609 2.235,-4.489 7.176,-6.57 11.037,-4.648 3.861,1.922 5.179,7.12 2.944,11.609" /></g><g
+           transform="translate(314.8665,403.7328)"
+           id="g36"><path
+             id="path38"
+             style="fill:#ec363a;fill-opacity:1;fill-rule:nonzero;stroke:none"
+             d="m 0,0 c -2.824,-2.596 -7.864,-1.708 -11.259,1.982 -3.394,3.691 -3.858,8.788 -1.034,11.385 2.824,2.597 7.864,1.711 11.258,-1.982 C 2.361,7.694 2.824,2.597 0,0" /></g><g
+           transform="translate(317.6634,389.8295)"
+           id="g40"><path
+             id="path42"
+             style="fill:#ec363a;fill-opacity:1;fill-rule:nonzero;stroke:none"
+             d="m 0,0 c -1.522,1.306 -4.082,4.722 -6.129,10.225 -2.047,5.504 -2.343,9.762 -2.044,11.747 1.521,-1.306 4.08,-4.723 6.129,-10.226 C 0.004,6.241 0.3,1.982 0,0 M 1.36,13.012 C -1.73,21.319 -6.673,27.146 -9.682,26.027 -12.69,24.908 -12.624,17.267 -9.533,8.96 -6.443,0.653 -1.5,-5.174 1.508,-4.055 4.517,-2.937 4.45,4.704 1.36,13.012" /></g><g
+           transform="translate(373.7332,244.9785)"
+           id="g44"><path
+             id="path46"
+             style="fill:#373535;fill-opacity:1;fill-rule:nonzero;stroke:none"
+             d="m 0,0 c 0,-3.51 -2.195,-6.356 -4.903,-6.356 -2.709,0 -4.903,2.846 -4.903,6.356 0,3.51 2.194,6.356 4.903,6.356 C -2.195,6.356 0,3.51 0,0" /></g><g
+           transform="translate(383.5394,242.9809)"
+           id="g48"><path
+             id="path50"
+             style="fill:#292929;fill-opacity:1;fill-rule:nonzero;stroke:none"
+             d="m 0,0 c 0,-3.209 -2.602,-5.812 -5.811,-5.812 -3.21,0 -5.811,2.603 -5.811,5.812 0,3.209 2.601,5.812 5.811,5.812 C -2.602,5.812 0,3.209 0,0" /></g><g
+           transform="translate(396.2518,241.165)"
+           id="g52"><path
+             id="path54"
+             style="fill:#292929;fill-opacity:1;fill-rule:nonzero;stroke:none"
+             d="m 0,0 c 0,-3.812 -3.09,-6.901 -6.901,-6.901 -3.811,0 -6.901,3.089 -6.901,6.901 0,3.812 3.09,6.901 6.901,6.901 C -3.09,6.901 0,3.812 0,0" /></g><g
+           transform="translate(370.8279,253.332)"
+           id="g56"><path
+             id="path58"
+             style="fill:#292929;fill-opacity:1;fill-rule:nonzero;stroke:none"
+             d="m 0,0 c 0,-1.906 -1.545,-3.45 -3.451,-3.45 -1.905,0 -3.45,1.544 -3.45,3.45 0,1.906 1.545,3.451 3.45,3.451 C -1.545,3.451 0,1.906 0,0" /></g><g
+           transform="translate(367.7401,254.8163)"
+           id="g60"><path
+             id="path62"
+             style="fill:#292929;fill-opacity:1;fill-rule:nonzero;stroke:none"
+             d="m 0,0 c 0,-0.719 -0.528,-1.303 -1.18,-1.303 -0.652,0 -1.18,0.584 -1.18,1.303 v 20.64 c 0,0.719 0.528,1.302 1.18,1.302 0.652,0 1.18,-0.583 1.18,-1.302 z" /></g><g
+           transform="translate(379.5443,246.0683)"
+           id="g64"><path
+             id="path66"
+             style="fill:#292929;fill-opacity:1;fill-rule:nonzero;stroke:none"
+             d="m 0,0 c 0,-1.003 -0.813,-1.816 -1.816,-1.816 -1.003,0 -1.816,0.813 -1.816,1.816 v 37.591 c 0,1.004 0.813,1.817 1.816,1.817 1.003,0 1.816,-0.813 1.816,-1.817 z" /></g><g
+           transform="translate(371.7357,246.0683)"
+           id="g68"><path
+             id="path70"
+             style="fill:#292929;fill-opacity:1;fill-rule:nonzero;stroke:none"
+             d="m 0,0 c 0,-1.003 -0.813,-1.816 -1.816,-1.816 -1.003,0 -1.816,0.813 -1.816,1.816 v 37.591 c 0,1.004 0.813,1.817 1.816,1.817 1.003,0 1.816,-0.813 1.816,-1.817 z" /></g><g
+           transform="translate(390.2586,244.7973)"
+           id="g72"><path
+             id="path74"
+             style="fill:#292929;fill-opacity:1;fill-rule:nonzero;stroke:none"
+             d="m 0,0 c 0,-1.103 -0.895,-1.998 -1.997,-1.998 -1.103,0 -1.998,0.895 -1.998,1.998 v 42.313 c 0,1.103 0.895,1.998 1.998,1.998 1.102,0 1.997,-0.895 1.997,-1.998 z" /></g><g
+           transform="translate(-2e-4,864.4169)"
+           id="g76"><path
+             id="path78"
+             style="fill:#292929;fill-opacity:1;fill-rule:nonzero;stroke:none"
+             d="m 0,0 c 8.717,0 351.578,1.453 351.578,1.453 0,0 -2.906,-26.15 17.434,-59.565 20.339,-33.415 62.47,-66.829 49.395,-79.904 -13.075,-13.075 -34.141,-22.761 -26.15,-55.207 7.99,-32.445 18.886,-46.489 7.263,-62.47 -11.622,-15.98 -100.969,-102.423 -108.597,-163.077 -7.627,-60.655 -13.438,-78.088 -27.966,-105.691 C 248.429,-552.065 159.809,-645.043 107.508,-708.967 55.207,-772.89 2.906,-864.417 2.906,-864.417 Z" /></g></g></g></g></svg>
\ No newline at end of file
diff --git a/homepage/participo/images/obi.svg b/homepage/participo/images/obi.svg
new file mode 100644
index 0000000..cdfcc89
--- /dev/null
+++ b/homepage/participo/images/obi.svg
@@ -0,0 +1,13 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<svg viewBox="0 0 712.09003 444.35999" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink">
+ <g transform="translate(-20,-260)" fill="#ff8c00" stroke="#000">
+  <path d="m30.014 279.4s318.35-0.63435 326.15 3.2665 37.708 6.5014 37.708 6.5014-28.606 3.9009-44.21 24.705-29.907 40.309-29.907 40.309l-289.83 1.0346" stroke-width="3.29"/>
+  <path d="m345.81 318.36c19.37-27.979 41.609-25.109 48.783-28.696s22.957 43.761 7.174 53.088-53.805 43.044-53.805 43.044l-0.7174 1.4348" stroke-width="3.29"/>
+  <path d="m475.66 309.75c-7.8914-30.131 7.8914-37.305-24.392-35.153s-53.088-2.8696-54.522 8.6088-10.044 66.718 9.3262 74.61 80.349 38.74 82.501 24.392-7.8914-19.37-7.8914-19.37l-5.0218-53.088z" stroke-width="3.29"/>
+  <path d="m722.89 359.52-210.01 0.56759 1.4364-82.648 210.07 1.2833" stroke-width="3.2344"/>
+  <path d="m472.79 288.23s88.24 22.957 84.653 31.566-25.109 61.696-35.87 59.544-40.892-10.044-42.327-17.218-5.7392-73.175-6.4566-73.892z" stroke-width="3.29"/>
+  <path d="m550.98 314.05s78.806-8.938 68.87-17.218c-12.913-10.761-62.414-39.457-77.479-35.153s-60.979 28.696-60.979 28.696l69.588 23.674z" stroke-width="3.29"/>
+  <path d="m637.79 657.17s1.4348-316.57-2.1522-321.59-1.4348-49.501-36.587-38.022-47.348 16.5-47.348 16.5 15.783-9.3262 17.218 5.7392-7.0218 337.22-7.0218 337.22" stroke-width="3.29"/>
+  <path d="m270.84 694.46s4.6324-216.62 2.8248-237.5c-2.4212-27.979 63.714-134.65 71.516-137.25s5.2012 375.2 5.2012 375.2" stroke-width="3.29"/>
+ </g>
+</svg>
diff --git a/homepage/participo/index.php b/homepage/participo/index.php
new file mode 100644
index 0000000..a30f3cd
--- /dev/null
+++ b/homepage/participo/index.php
@@ -0,0 +1,167 @@
+<?php
+setlocale (LC_ALL, 'de_DE@euro', 'de_DE', 'de', 'ge');
+	require_once("config/participo.php");
+	
+	require_once("./local/dbConf.php");
+	require_once("./local/cwsvJudo.php");
+
+	require_once("./lib/db.php");
+	require_once("./lib/api.php");
+	require_once("./lib/participoLib/participo.php");
+
+	require_once("./auth.php");
+
+	require_once($config['basePath']."/config/cwsvJudo.config.php");
+	require_once($config['basePath']."/config/phpcount.config.php");
+
+	$dbConnection = getPdoDbConnection(
+		$cwsvJudoConfig["db"]["host"], 
+		$cwsvJudoConfig["db"]["name"], 
+		$cwsvJudoConfig["db"]["user"],
+		$cwsvJudoConfig["db"]["password"]
+	);
+	$userData = getUserData($dbConnection, $_SESSION['user']['userId']);
+?>
+<!DOCTYPE html>
+<html>
+	<head>
+		<meta charset="utf-8" />
+		<meta name="viewport" content="width=device-width, initial-scale=1.0" />
+
+		<!-- MaterializeCss Ressources -->
+		<!-- - Compiled and minified CSS -->
+		<link rel="stylesheet" href="https://cdn.jsdelivr.net/npm/@materializecss/materialize@1.1.0-alpha/dist/css/materialize.min.css">
+		<!-- - Compiled and minified JavaScript -->
+		<script src="https://cdn.jsdelivr.net/npm/@materializecss/materialize@1.1.0-alpha/dist/js/materialize.min.js"></script>
+		<!-- - Import Google Icon Font-->
+		<link rel="stylesheet" href="https://fonts.googleapis.com/icon?family=Material+Icons">
+
+		<!-- participo specific style adjustments -->
+		<link rel="stylesheet" href="css/participo.css">
+
+		<!-- inits for the materializeCss -->
+		<script>
+			document.addEventListener('DOMContentLoaded', function() {
+				var elems = document.querySelectorAll('.sidenav');
+				var instances = M.Sidenav.init(elems, {
+					// specify options here
+				});
+			});
+		</script>
+
+		<title>participo</title>
+		<meta name="description" content="Online-Apps der Judoka des Chemnitzer WSV">
+
+		<link rel="icon"             href="<?echo($config['ressourceUrl']);?>/graphiken/icons/cwsv.ico" />
+		<link rel="apple-touch-icon" href="<?echo($config['baseUrl']);?>/apple-touch-icon.png">
+	</head>
+
+	<body>
+
+		<header>
+			<nav class="indigo darken-4">cwsvJudo Apps<a class="right top-nav sidenav-trigger waves-effect waves-light hide-on-large-only" href="#" data-target="nav-mobile">
+				<i class="material-icons">menu</i>
+			</a></nav>
+			<ul class="sidenav sidenav-fixed sidenav-close" id="nav-mobile">
+				<li class="logo">
+					<a style="height:auto;" class="brand-logo" id="logo-container" href="/participo/">
+						<img style="max-width:100%;height:12vh;" class="responsive-img" src="http://cwsvjudo.bplaced.net/ressourcen/graphiken/logos/cwsvJudoLogoWappen.x256.png" />
+					</a>
+				</li>
+				<li><?php require_once("sidenav/loginStatus.php");?></li>
+				<li class="bold">
+					<a class="waves-effect waves-teal right-align" href="#AppList">Apps</a>
+				</li>
+				<li class="bold">
+					<a class="waves-effect waves-teal right-align" href="#Configs">UserInfos</a>
+				</li>
+<?php if( isUserAdmin($dbConnection, $userData['id']) ){?>
+				<li class="bold">
+					<a class="waves-effect waves-teal right-align" href="#Admin">adminStuff</a>
+				</li>
+<?php }?>
+			</ul>
+		</header>
+
+<?php
+if($_SESSION['login']){
+?>
+		<main>
+			<!-- List of Mitmach-Apps -->
+			<div class="row" id="AppList">
+<?php 
+
+echo(
+	AppCard::fromArray([
+		'link'       => "kyu",
+		'title'      => "Kyu",
+		'description'=> "Die Prüfungsprogamme der einzelnen Gürtelstufen in Bild, Ton und Text",
+		'imgUrl'     => "images/obi.svg",
+		'actions'    => [
+			AppCardAction::fromArray(['caption'=>"Kyu-Programme", 'link'=>"kyu"]),
+		],
+	])->htmlCode().
+	AppCard::fromArray([
+		'link'       => "/machs",
+		'title'      => "<strong>M</strong>ein <strong>Ach</strong>ievement <strong>S</strong>ystem",
+		'description'=> "Ein kleines Achievementsystem für die tägliche Herausforderung",
+		'imgUrl'     => "images/mountain-climber.svg",
+		'actions'    => [
+			AppCardAction::fromArray(['caption'=>"MAchS", 'link'=>"/machs"]),
+		],
+	])->htmlCode().
+	AppCard::fromArray([
+		'link'       => "/pages/desktop/wkParticipo",
+		'title'      => "Event-Planer",
+		'description'=> "Organisieren der Teilnahmen (und nicht-Teilnahmen) an Wettkämpfen, Sondertrainingseinheiten, Feiern etc.",
+		'imgUrl'     => "/ressourcen/graphiken/icons/terminKalender.svg",
+		'actions'    => [
+			AppCardAction::fromArray(['caption'=>"Planer", 'link'=>"/pages/desktop/wkParticipo"]),
+		],
+	])->htmlCode().
+	AppCard::fromArray([
+		'link'       => "infoZettel",
+		'title'      => "Infozettel",
+		'description'=> "Online-Variante der Infozettel und Newsletter",
+		'imgUrl'     => "images/info.svg",
+		'actions'    => [
+			AppCardAction::fromArray(['caption'=>"Info", 'link'=>"infoZettel"]),
+		],
+	])->htmlCode()
+);
+?>
+			</div><!-- End of MitmachApps -->
+			
+			<div class="divider"></div>
+
+			<!-- List of ConfigStuff -->
+			<div class="row" id="Configs">
+<?php
+echo(
+	AppCard::fromArray([
+		'link' => "user",
+		'title' => "User-Config",
+		'description' => "Einstellungen zum aktuellen Benutzer dessen Kindern",
+		'imgUrl' => "images/account.svg",
+		'actions' => [
+			AppCardAction::fromArray(['caption'=>"Config", 'link'=>"user"]),
+		],
+	])->htmlCode()
+);
+// AdminStuff, thats only visible for Admins
+if( isUserAdmin($dbConnection, $userData['id']) ){
+	echo(
+		AppCard::fromArray([
+			'title' =>"lastLogins",
+			'description' => lastLoginTable()
+		])->htmlCode()
+	);
+}
+?>
+			</div><!-- End of ConfigStuff -->
+		</main>
+<?php
+}
+?>
+	</body>
+</html>
diff --git a/homepage/participo/infoZettel.php b/homepage/participo/infoZettel.php
index 5a83ce7..23eee0f 100644
--- a/homepage/participo/infoZettel.php
+++ b/homepage/participo/infoZettel.php
@@ -34,6 +34,16 @@ $years = array_unique($years);
 		<meta name="viewport" content="width=device-width, initial-scale=1.0" />
 
 		<?php readfile("./shared/imports.php");?>
+		<!-- MaterializeCss Ressources -->
+		<!-- - Compiled and minified CSS -->
+		<link rel="stylesheet" href="https://cdn.jsdelivr.net/npm/@materializecss/materialize@1.1.0-alpha/dist/css/materialize.min.css">
+		<!-- - Compiled and minified JavaScript -->
+		<script src="https://cdn.jsdelivr.net/npm/@materializecss/materialize@1.1.0-alpha/dist/js/materialize.min.js"></script>
+		<!-- - Import Google Icon Font-->
+		<link rel="stylesheet" href="https://fonts.googleapis.com/icon?family=Material+Icons">
+
+		<!-- participo specific style adjustments -->
+		<link rel="stylesheet" href="css/participo.css">
 		<!-- adjustments to parsedowncards (smaller headings) -->
 		<link rel="stylesheet" href="css/parsedownCard.css">
 
@@ -78,6 +88,9 @@ foreach($years as $year){?>
 <?php
 }
 ?>
+				<li class="bold">
+					<a class="waves-effect waves-teal right-align" href="#infos">Infos</a>
+				</li>
 			</ul>
 		</header>
 
@@ -98,6 +111,11 @@ foreach($fileList as $file){
 		echo("<h2 id=\"infoZettel-".$currentYear."\">".$currentYear."</h2>");
 	}
 
+// get a list of all infoZettel
+$fileList = glob($basePath."/infoZettel/*.md");
+rsort($fileList);
+
+foreach($fileList as $file){
 	$infoZettel = loadMarkdownFile($file);
 	echo(
 		AppCard::fromArray([
diff --git a/homepage/participo/kyu.php b/homepage/participo/kyu.php
new file mode 100644
index 0000000..b04847f
--- /dev/null
+++ b/homepage/participo/kyu.php
@@ -0,0 +1,256 @@
+<?php
+require_once("./auth.php");
+
+require("lib/Parsedown.php");
+require("lib/Spyc.php");
+
+$mdRoot = "markdown/".(array_key_exists('kyu', $_GET)?$_GET['kyu']:"8")."terKyu";
+
+$Parsedown = new Parsedown();
+
+//! loading a markdownfile with yaml-header
+//! returns an assocative array('yaml'=>array(..), 'mdText'=>string)
+function loadMarkdownFile($fileName){
+	$fileText = file_get_contents($fileName);
+
+	$fileParts = preg_split('/[\n]*[-]{3}[\n]/', $fileText, 3);
+
+	return array(
+		'yaml' => Spyc::YAMLLoadString($fileParts[1])
+		, 'mdText' => preg_replace("/^#(.*)$/m", "", $fileParts[2])
+	);
+}
+
+/// @brief Gibt die URL der gerade aufgerufenen Seite zurück
+function getCurPagesUrl(){
+	$pageURL = 'http';
+	if ($_SERVER["HTTPS"] == "on"){
+		$pageURL .= "s";
+	}
+	$pageURL .= "://";
+	if($_SERVER["SERVER_PORT"] != "80"){
+		$pageURL .= $_SERVER["SERVER_NAME"].":".$_SERVER["SERVER_PORT"].$_SERVER["REQUEST_URI"];
+	}
+	else{
+		$pageURL .= $_SERVER["SERVER_NAME"].$_SERVER["REQUEST_URI"];
+	}
+return $pageURL;
+}
+
+function htmlCardCode($article, $Parsedown){
+	if(
+		empty($article['yaml'])
+		&& empty($article['mdText'])
+	) return "";
+	$videoFrame = (
+		array_key_exists('yaml', $article)
+		?(
+			array_key_exists('video', $article['yaml'])
+			?(
+				"<div style=\"text-align: center;width=100%;height=auto;\">".html5VideoFrame($article['yaml']['video'])."</div>"
+			)
+			:""
+		)
+		:""
+	);
+	$ytVideoFrame = (
+		array_key_exists('yaml', $article)
+		?(
+			array_key_exists('youtube', $article['yaml'])
+			?(
+				ytLightEmbed($article['yaml']['youtube'])
+			)
+			:""
+		)
+		:""
+	);
+return
+	"<div class=\"col s12 m6\">"
+		."<div class=\"card blue-grey darken-1\">"
+			."<div class=\"card-image\">"
+				.(!empty($videoFrame)?$videoFrame:$ytVideoFrame)
+			."</div>"
+			."<div class=\"card-content white-text\">"
+				."<span class=\"card-title activator\">"
+					.$article['yaml']['title']
+					."<i class=\"material-icons right\">more_vert</i>"
+				."</span>"
+			."</div>"
+			."<div class=\"card-reveal\">"
+				."<span class=\"card-title\">"
+					.$article['yaml']['title']
+					."<i class=\"material-icons right\">close</i>"
+				."</span>"
+				.$Parsedown->text($article['mdText'])
+			."</div>"
+		."</div>"
+	."</div>";
+}
+
+//! create the <video>Tag for videoJs
+function videoJsFrame($item){
+	return "<video "
+		."id=\"".str_replace("/", "-", $item['url'])."\" "
+		."class=\"video-js\" "
+		."controls "
+		."preload=\"auto\" "
+		// ."poster=\"//vjs.zencdn.net/v/oceans.png\""
+		."data-setup='{}' "
+	.">"
+		."<source src=\"".$item['url']."\" type=\"video/webm\">"//</source>"
+		."<p class=\"vjs-no-js\">"
+			."To view this video please enable JavaScript, and consider upgrading to a web browser that "
+			."<a href=\"https://videojs.com/html5-video-support/\" target=\"_blank\">"
+				."supports HTML5 video"
+			."</a>"
+		."</p>"
+	."</video>";
+}
+
+function html5VideoFrame($item){
+	return "<video "
+		."style=\"max-width:100%;height: auto;\""
+		." src=\"".$item['url']."\""
+		." width=\"".$item['width']."\""
+		." height=\"".$item['height']."\""
+		." controls"
+	."></video>";
+}
+
+//! embed youtube
+function ytLightEmbed($item){
+	return "<lite-youtube "
+		."videoid=\"".$item['videoid']."\" "
+		// ."playlabel=\"".$title."\""
+		."params=\""
+			."start=".$item['from']
+			."&end=".$item['to']
+			."&modestbranding=1"
+			."&playsinline=0"
+			."&loop=1"
+		."\" "
+	."></lite-youtube>";
+}
+?>
+<!DOCTYPE html>
+<html lang="de">
+	<head>
+		<meta charset="UTF-8">
+		<title>Gürtelprüfungsordnung</title>
+
+		<!-- Compiled and minified CSS -->
+		<link rel="stylesheet" href="https://cdn.jsdelivr.net/npm/@materializecss/materialize@1.1.0-alpha/dist/css/materialize.min.css">
+		<!-- Compiled and minified JavaScript -->
+		<script src="https://cdn.jsdelivr.net/npm/@materializecss/materialize@1.1.0-alpha/dist/js/materialize.min.js"></script>
+		<!--Import Google Icon Font-->
+		<link href="https://fonts.googleapis.com/icon?family=Material+Icons" rel="stylesheet">
+		<!-- unpkg : use the latest version of Video.js -->
+		<link href="https://unpkg.com/video.js/dist/video-js.min.css" rel="stylesheet">
+		<script src="https://unpkg.com/video.js/dist/video.min.js"></script>
+		
+		<!-- Include the CSS & JS.. (This could be direct from the package or bundled) -->
+		<link rel="stylesheet" href="lib/lite-youtube-embed/lite-yt-embed.css" />
+		<script src="lib/lite-youtube-embed/lite-yt-embed.js"></script>
+
+		<!--- AutoInit -->
+		<script>
+			document.addEventListener('DOMContentLoaded', function() {
+				var materialboxElements = document.querySelectorAll('.materialboxed');
+				var materialboxInstances = M.Materialbox.init(materialboxElements, {
+					// specify options here
+				});
+			});
+			document.addEventListener('DOMContentLoaded', function() {
+				var elems = document.querySelectorAll('.sidenav');
+				var instances = M.Sidenav.init(elems, {
+					// specify options here
+				});
+			});
+		</script>
+		<style>
+			h1{
+				font-size: 2.5rem;				
+			}
+			h2{
+				font-size: 2.25rem;
+			}
+			h3{
+				font-size: 2.0rem;
+			}
+		</style>
+		
+	  	<!--Let browser know website is optimized for mobile-->
+		<meta name="viewport" content="width=device-width, initial-scale=1.0"/>
+		<style>
+			ul:not(.browser-default) > li{
+				list-style-type: circle;
+			}
+		</style>
+	</head>
+
+	<body>
+		<ul id="slide-out" class="sidenav">
+			<?php require_once("sidenav/loginStatus.php");?>
+			<li><div class="divider"></div></li>
+			<?php require_once("sidenav/kyu.php"); ?>
+			<li><div class="divider"></div></li>
+			<?php require_once("sidenav/backToMain.php"); ?>
+		</ul>
+		<a href="#" data-target="slide-out" class="sidenav-trigger"><i class="material-icons">menu</i></a>
+			<?php
+			$kyuMetadata = Spyc::YAMLLoad( $mdRoot."/meta.yaml" );
+			echo("<h1>".$kyuMetadata['title']."</h1>");
+
+			$dirNames = [];
+			$dirIterator = new DirectoryIterator( $mdRoot );			
+			foreach ( $dirIterator as $dirInfo ) {
+				if(!$dirInfo->isDir() || $dirInfo->isDot()) continue;
+				$dirNames[] = $dirInfo->__toString();
+			}
+			sort($dirNames);
+			foreach($dirNames as $dirName){
+				$fullDirName = $mdRoot."/".$dirName;
+				$sectionMetadata = Spyc::YAMLLoad( $fullDirName."/meta.yaml" );
+				echo("<div class=\"row\">");
+				echo("<h2>".$sectionMetadata['title']."</h2>");
+
+				$fileIterator = new DirectoryIterator($fullDirName);				
+				$fileNames = [];
+				foreach($fileIterator as $fileInfo){
+					if(!$fileInfo->isFile()) continue;
+					if( $fileInfo->getExtension() != "md") continue;
+					$fileNames[] = $fileInfo->__toString();
+				}
+				sort($fileNames);
+				foreach( $fileNames as $fileName){
+					$fullFileName = $fullDirName."/".$fileName; 
+					$article = loadMarkdownFile( $fullFileName );
+					echo( htmlCardCode($article, $Parsedown) );
+				}
+				echo("</div>");
+			};
+			?>
+
+		<footer class="page-footer blue-grey darken-1">
+			<div class="container">
+				<div class="col l4 offset-l2 s12">
+					<ul>
+						<li>
+							<a 
+								title="Seite auf HTML 5 Konformität prüfen"
+								href="http://validator.w3.org/check?uri=<?php echo(urlencode(getCurPagesUrl()));?>"
+								rel="nofollow"
+							>Valid <img
+								src="/ressourcen/graphiken/icons/HTML5_1Color_Black.svg"
+								alt="HTML 5"
+								title="HTML 5 Logo"
+								style="height:1em;display:inline;vertical-align:middle;">
+							</a>
+						</li>
+					</ul>
+				</div>
+			</div>
+		</footer>
+
+	</body>
+</html>
\ No newline at end of file
diff --git a/homepage/participo/lib/api.php b/homepage/participo/lib/api.php
new file mode 100644
index 0000000..b455d83
--- /dev/null
+++ b/homepage/participo/lib/api.php
@@ -0,0 +1,176 @@
+<?php
+
+function processPostData($db, $post, $redirectLocation = "."){
+	sleep(1);
+	if($post['action']){
+		// if there is a redirectlocation, set it
+		if($post['redirectLocation']){
+			$redirectLocation = $post['redirectLocation'];
+		}
+		
+		// change a users password
+		if($post['action']=="changePassword"){
+			$success = changePassword(
+				$db,
+				$post['changerId'],
+				$post['changeeId'],
+				$post['changerPassword'],
+				$post['newPassword'],
+				$post['newPasswordAgain']
+			);
+			// append success to the redirectlocation
+			if($success){
+				$redirectLocation .= "?changePasswordSuccess=true";
+			}
+			else{
+				$redirectLocation .= "?changePasswordSuccess=false";
+			}
+		}// end changePassword
+		
+		// redirect to the redirectlocation
+		header("Location: ".$redirectLocation);
+	}// end processing action
+return;
+}
+
+function sendEmail($toEmail, $emailText, $emailSubject){
+	try{
+		$date=new DateTime();
+		mail(
+			$toEmail,
+			$emailSubject,
+			$emailText
+		);
+	}
+	catch(Exception $e) {
+	  echo 'Message: ' .$e->getMessage();
+	}
+}
+
+function attendancesAssocArray2text($attendancesAssocArray){
+	$ret = "";
+	foreach($attendancesAssocArray as $date => $attendees){
+		$ret .= $date."\n";
+		foreach($attendees as $a){
+			$ret .= "\n";
+			$ret .= "Name: ".$a['name'].", ".$a['vorname']."\n";
+			$ret .= "PLZ: ".$a['corona_PLZ']."\n";
+			$ret .= "Tel.: ".$a['corona_telephon']."\n";
+			$ret .= "eMail: ".$a['corona_eMail']."\n";
+		}
+		$ret .= "\n";
+	}
+return $ret;
+}
+
+function attendancesAssocArray2mdList($attendancesAssocArray, $date=null){
+	if($date == null)
+		$date=new DateTime();
+	$ret = "# Anwesenheitsliste zur Corona-Kontaktverfolgung der Abteilung Judo des CWSV vom ".$date->format("Y-m-d")."\n\n";
+	foreach($attendancesAssocArray as $d => $attendees){
+		$ret .= "## ".$d."\n";
+		$i=0;
+		foreach($attendees as $a){
+			$i += 1;
+			$ret .= "\n";
+			$ret .= $i." ".$a['name'].", ".$a['vorname']."\n";
+			$ret .= "    - PLZ: ".$a['corona_PLZ']."\n";
+			$ret .= "    - Tel.: ".$a['corona_telephon']."\n";
+			$ret .= "    - eMail: ".$a['corona_eMail']."\n";
+		}
+		$ret .= "\n";
+	}
+return $ret;
+}
+
+//! Checks if multiple keys exist in an array
+//!
+//! @param array $array array to check for key
+//! @param array|string $keys keys to check for
+//!
+//! @return bool true, if *all* keys are set in the array
+function array_keys_exist( array $array, $keys ) {
+	if ( ! is_array( $keys ) ) {
+		$keys = func_get_args();
+		array_shift( $keys );
+	}
+	$count = 0;
+	foreach ( $keys as $key ) {
+		if ( isset( $array[$key] ) || array_key_exists( $key, $array ) ) {
+			$count++;
+		}
+	}
+
+	return count( $keys ) === $count;
+}
+
+/// updates users password without checking any rights
+/// params:
+/// - $db : pdoDbConnection to use
+/// - $userId : id of the user with the password to change
+/// - $password : the password to set
+function updateUserPassword($db, $userId, $password){
+	// we don't save the actual password but it's hash
+	if($password != ""){
+		$password = password_hash( $password, PASSWORD_DEFAULT);
+	}
+	else{
+		$password = NULL;
+	}
+	
+	$query = "UPDATE `cwsvjudo`.`wkParticipo_Users` SET `pwHash`=:val WHERE `id`=:id;";
+	$params = array(
+		':val' => array('value'=>$password, 'data_type'=>PDO::PARAM_STR), 
+		':id'  => array('value'=>$userId,   'data_type'=>PDO::PARAM_INT) 
+	);
+	dbQuery($db, $query, $params);
+	
+	return;
+}
+
+/// Change a users password (apiFunction)
+/// params:
+/// - $db: dbConnection to use
+/// - $changerId: userId who changes the password
+/// - $changeeId: userId whose password should be changed
+/// - $ownPassword: password of the user who changes the password
+/// - $newPasword: the new password
+/// - $newPasswordAgain: controllInput of the new password
+function changePassword($db, $changerId, $changeeId, $changerPassword, $newPassword, $newPasswordAgain){
+	// we need a dbConnection
+	if( !$db ){
+//		echo("No DB!");
+		return false;
+	}
+	
+	$changerInfo = getUserData($db, $changerId);
+	
+	// check the password of the changer
+	if( !password_verify( $changerPassword, $changerInfo['pwHash']) ){
+//		echo("Wrong changerPasswod");
+		return false;
+	}
+	
+	// check if the changer is allowed to change the changees password
+	if ( $changerId != $changeeId ){
+		$changersKidsIds = getUsersKidsIds($db, $changerId);
+		
+//		if( !in_array($changeeId, $changersKidsIds) ){
+		if( !isUserInKidIds($changeeId, $changersKidsIds) ){
+//			echo("not your child: ".$changeeId." not in "); var_dump($changersKidsIds);
+			return false;
+		}
+	}
+	
+	// check if the two inputs are the same
+	if( $newPassword != $newPasswordAgain ){
+//		echo("new pw missmatch");
+		return false;
+	}
+	
+	updateUserPassword($db, $changeeId, $newPassword);
+	
+	return true;
+}
+
+?>
diff --git a/homepage/participo/lib/db.php b/homepage/participo/lib/db.php
new file mode 100644
index 0000000..ba94771
--- /dev/null
+++ b/homepage/participo/lib/db.php
@@ -0,0 +1,430 @@
+<?php
+// get a Connection to the database
+function getPdoDbConnection($hostname, $dbName, $user, $password){
+	try{
+		$dbConnection = new PDO(
+			'mysql:host='.$hostname.';dbname='.$dbName, 
+			$user, 
+			$password
+		);
+	}
+	catch(PDOException $dbError){
+		echo( "Error whilst getting a dbConnection!: " . $dbError->getMessage() );
+	}
+return $dbConnection;
+}
+
+function createDb($dbConnection){
+<<<SQL
+CREATE TABLE `cwsvjudo`.`anwesenheit` ( 
+  `id` INT UNSIGNED NOT NULL , 
+  `userId` INT UNSIGNED NOT NULL , 
+  `date` DATE NOT NULL DEFAULT CURRENT_TIMESTAMP , 
+  PRIMARY KEY (`id`)
+) ENGINE = InnoDB;
+ALTER TABLE `cwsvjudo`.`anwesenheit` ADD UNIQUE `attandence` (`userId`, `id`); 
+SQL;
+}
+
+/// perform a pdo-query
+///
+/// @param aDbConnection
+/// @param $aQueryString
+/// @param $aBindArray e.g. array( 
+///  ':userId'     => array('value'=>$anUserId,      'data_type'=>PDO::PARAM_INT), 
+///  ':attributeId'=> array('value'=>$anAttributeId, 'data_type'=>PDO::PARAM_INT) )
+/// @param $someOption
+function dbQuery($aDbConnection, $aQueryString, $aBindArray = array(), $someOptions = array()){
+// Standardbelegungen
+if( empty($someOptions['dbCharset' ]) ) $someOptions['dbCharset' ] = "ISO-8859-1";
+if( empty($someOptions['outCharset']) ) $someOptions['outCharset'] = "UTF-8";
+if( empty($someOptions['dontFetch' ]) ) $someOptions['dontFetch' ] = false;
+/// @toDo: Bisher wird nur die Rückgabe konvertiert. Eigentlich muss 
+///  doch auch die Eingabe konvertiert werden. Aber das jetzt 
+///  umzustellen wird schwer! Die User m Wettkampfplaner sind ja z.B. 
+///  als UTF8 in latin1(?) gespeichert.
+/// @toDo: Die Standardwerte sollten vielleicht aus einer config 
+///  kommen, nicht hardcoded
+	try{
+		$pdoStatement = $aDbConnection->prepare( $aQueryString );
+		foreach( $aBindArray as $bindName => $bind ){
+			if( $bind['data_type'] == PDO::PARAM_STR)
+				$bind['value'] = iconv(
+					$someOptions['outCharset'], 
+					$someOptions['dbCharset'], 
+					$bind['value']
+				);
+			$pdoStatement->bindValue(
+				$bindName,
+				$bind['value'],
+				(isset($bind['data_type'])?$bind['data_type']:PDO::PARAM_STR)
+			);
+		}
+		$pdoResult = $pdoStatement->execute();
+		if(!$pdoResult){
+			echo("Error during dbQuery!\n");
+			echo("DB-Error:\n"); var_dump($aDbConnection->errorInfo());
+//			var_dump($aQueryString);
+//			var_dump($aBindArray);
+//			echo($pdoStatement.errorInfo());
+		}
+		if($someOptions['dontFetch']){
+			$ret = NULL;
+		}
+		else{
+			$ret = $pdoStatement->fetchAll(PDO::FETCH_ASSOC);
+		}
+	}
+	catch(PDOException $db_error){
+		print "Error!: " . $db_error->getMessage() . "<br/>";
+		return null;
+	}
+// Zeichensatzkonvertierung
+	if( is_array($ret) ){
+		foreach($ret as &$entry){
+			array_walk(
+				$entry,
+				function (&$value, $key, $someOptions) {
+					$value = iconv($someOptions['dbCharset'], $someOptions['outCharset'], $value);
+				},
+				$someOptions
+			);
+		}
+	}
+//var_dump($ret);
+//var_dump($aQueryString);
+//var_dump($aBindArray);
+return $ret;
+}
+
+function getLastAttendances($db, $minDate=null){
+if ($minDate == null){
+	$minDate = new DateTime;
+	$minDate->sub(new DateInterval("P1M")); // from the current date subtract a *P*eriod of *1* *M*onth
+}
+
+	$query = <<<SQL
+SELECT userId, date, vorname, name, corona_PLZ, corona_telephon, corona_eMail 
+FROM `cwsvjudo`.`anwesenheit` 
+JOIN `cwsvjudo`.`wkParticipo_Users` 
+  ON `cwsvjudo`.`anwesenheit`.`userId` = `cwsvjudo`.`wkParticipo_Users`.`id` 
+WHERE :minDate <= date 
+ORDER BY `date` DESC, `name`;
+SQL;
+	$params = array(
+		'minDate' => array('value' => $minDate->format('Y-m-d'), 'data_type' => PDO::PARAM_STR)
+	);
+	$options = array();
+	$ret = dbQuery($db, $query, $params, $options);
+return $ret;
+}
+
+function getUsersWithAttribute($dbConnection, $attributeName){
+	$query = <<<SQL
+SELECT userId, name, vorname 
+FROM `cwsvjudo`.`wkParticipo_Users` 
+JOIN `cwsvjudo`.`wkParticipo_user<=>userAttributes` 
+  ON `cwsvjudo`.`wkParticipo_Users`.`id` =`cwsvjudo`.`wkParticipo_user<=>userAttributes`.`userId` 
+WHERE `cwsvjudo`.`wkParticipo_user<=>userAttributes`.`attributeId` IN (
+  SELECT `id` FROM `cwsvjudo`.`wkParticipo_userAttributes` WHERE `name` = :attributeName
+);
+SQL;
+	$params = array(
+		':attributeName' => array('value'=>$attributeName, 'data_type'=>PDO::PARAM_STR) 
+	);
+return dbQuery($dbConnection, $query, $params);
+}
+
+function giveUserAnUserAttribute($dbConnection, $userId, $attributeName){
+	$query = <<<SQL
+INSERT INTO `cwsvjudo`.`wkParticipo_user<=>userAttributes` (`userId`, `attributeId`) 
+SELECT :userId, `id` 
+FROM `cwsvjudo`.`wkParticipo_userAttributes` 
+WHERE `name` = :attributeName;
+SQL;
+	$params = array(
+		':userId'        => array('value'=>$userId,        'data_type'=>PDO::PARAM_INT), 
+		':attributeName' => array('value'=>$attributeName, 'data_type'=>PDO::PARAM_STR) 
+	);
+return dbQuery($dbConnection, $query, $params);
+}
+
+function hasUserAttribute($dbConnection, $userId, $attributeName){
+	$query = <<<SQL
+SELECT `wkParticipo_user<=>userAttributes`.userId, `wkParticipo_userAttributes`.name 
+FROM `wkParticipo_user<=>userAttributes` LEFT JOIN `wkParticipo_userAttributes` 
+ON `wkParticipo_user<=>userAttributes`.`attributeId` = `wkParticipo_userAttributes`.`id` 
+WHERE `wkParticipo_userAttributes`.name = :attributeName AND userId=:userId;",
+SQL;
+	$params = array(
+		':userId'        => array('value'=>$userId,        'data_type'=>PDO::PARAM_INT), 
+		':attributeName' => array('value'=>$attributeName, 'data_type'=>PDO::PARAM_STR) 
+	);
+	$attributedUsers = dbQuery($dbConnection, $query, $params);
+	foreach($attributedUsers as $u)
+		if($u['userId']==$userId)
+			return true;
+return false;
+}
+
+function giveJudokasAttendence($dbConnection, $date, $ids){
+	$values = array();
+	try{
+		foreach( $ids as $id){
+			array_push( $values, "(\"".$date."\", ".$id.")");;
+		}
+		$query = "INSERT INTO `cwsvjudo`.`anwesenheit` (`date`, `userId`) VALUES ".join(",", $values).";";
+		dbQuery($dbConnection, $query, array(), ['dontFetch' => true]);
+	}
+	catch(PDOException $db_error){
+		print "Error!: " . $db_error->getMessage() . "<br/>";
+		return null;
+	}
+}
+
+function getUsersKidsIds($db, $userId){
+	$query = <<<SQL
+SELECT `kidId` 
+FROM `vormundschaft` 
+WHERE userId = :userId;
+SQL;
+	$params = [':userId'=>['value'=>$userId, 'data_type'=>PDO::PARAM_INT]];
+	$result = dbQuery($db, $query, $params);
+return $result;
+}
+
+function isUserInKidIds($uId, $idList){
+	foreach($idList as $id){
+		if($id['kidId'] == $uId)
+			return true;
+	}
+	return false;
+}
+
+
+// @todo: Achtung, als id ist die id der Vormundschaft gespeichert. Unter kidId die des Kindes.
+function getUsersKids($db, $userId){
+	$query = <<<SQL
+SELECT * 
+FROM `wkParticipo_Users` 
+JOIN `vormundschaft` 
+  ON `wkParticipo_Users`.`id` = `vormundschaft`.`kidId` 
+WHERE `vormundschaft`.`userId` = :userId;
+SQL;
+	$params = [':userId'=>['value'=>$userId, 'data_type'=>PDO::PARAM_INT]];
+	$result = dbQuery($db, $query, $params);
+return $result;
+}
+
+// updates corona data of an user
+function updateCoronaData($db, $userId, $columnName, $columnValue){
+	$coronaColumnNames = ["corona_PLZ", "corona_telephon", "corona_eMail"];
+	
+	if( !in_array( $columnName, $coronaColumnNames) ){
+		return;
+	}
+	$query = "UPDATE `cwsvjudo`.`wkParticipo_Users` SET `".$columnName."`=:val WHERE `id`=:id;";
+	$params = array(
+		':val' => array('value'=>$columnValue, 'data_type'=>PDO::PARAM_STR), 
+		':id'  => array('value'=>$userId,      'data_type'=>PDO::PARAM_INT) 
+	);
+	dbQuery($db, $query, $params);
+return;
+}
+
+function addCoronaUser($db, $name, $vorname, $corona_PLZ, $corona_telephon, $corona_eMail){
+	$query = <<<SQL
+INSERT INTO `cwsvjudo`.`wkParticipo_Users` (name, vorname, corona_PLZ, corona_telephon, corona_eMail) 
+VALUES (:name, :vorname, :plz, :telephon, :email);
+SQL;
+	$params = array(
+		':name' =>     array('value'=>$name,            'data_type'=>PDO::PARAM_STR), 
+		':vorname' =>  array('value'=>$vorname,         'data_type'=>PDO::PARAM_STR), 
+		':plz' =>      array('value'=>$corona_PLZ,      'data_type'=>PDO::PARAM_STR), 
+		':telephon' => array('value'=>$corona_telephon, 'data_type'=>PDO::PARAM_STR), 
+		':email' =>    array('value'=>$corona_eMail,    'data_type'=>PDO::PARAM_STR), 
+	);
+	dbQuery($db, $query, $params);
+	
+	$newId = $db->lastInsertId();
+	giveUserAnUserAttribute($db, $newId, "inTraining");
+return;
+}
+
+function giveUserAnAchievement($db, $userId, $achievementId){
+	$query = <<<SQL
+INSERT INTO `cwsvjudo`.`achievements<=>user` (`userId`, `achievementId`) VALUE (:userId, :achievementId);
+SQL;
+	$params = [':userId'=>['value'=>$userId, 'data_type'=>PDO::PARAM_INT], 'achievementId'=>['value'=>$achievementId, 'data_type'=>PDO::PARAM_INT]];
+	dbQuery($db, $query, $params);
+return;
+}
+
+function isUserAdmin($dbConn, $userId){
+	$adminUsers = 
+		dbQuery(
+			$dbConn,
+			"SELECT `wkParticipo_user<=>userAttributes`.userId, `wkParticipo_userAttributes`.name from `wkParticipo_user<=>userAttributes` LEFT JOIN `wkParticipo_userAttributes` ON `wkParticipo_user<=>userAttributes`.attributeId = `wkParticipo_userAttributes`.id WHERE `wkParticipo_userAttributes`.name = :attributeName;",
+			array(":attributeName"=>array('value'=>"isAdmin", 'data_type'=>PDO::PARAM_STR))
+		);
+	foreach($adminUsers as $adminUser)
+		if($adminUser['userId']==$userId)
+			return true;
+return false;
+}
+
+function getUserData($db, $userId){
+	$query = <<<SQL
+SELECT * 
+FROM `cwsvjudo`.`wkParticipo_Users` 
+WHERE `id` = :userId;
+SQL;
+	$params = [':userId'=>['value'=>$userId, 'data_type'=>PDO::PARAM_INT]];
+	$userData = dbQuery($db, $query, $params);
+return $userData[0];
+}
+
+function getAchievements($db){
+	$query = <<<SQL
+SELECT * 
+FROM `cwsvjudo`.`achievements`;
+SQL;
+return dbQuery($db, $query);
+}
+
+function getAchievement($db, $id){
+	$query = <<<SQL
+SELECT * 
+  FROM `cwsvjudo`.`achievements` 
+ WHERE `id`=:id;
+SQL;
+	$params = [':id'=>['value'=>$id, 'data_type'=>PDO::PARAM_INT]];
+return dbQuery($db, $query, $params);
+}
+
+function addAchievement($db, $name, $rootId, $achievementGroupId, $level, $description, $imgUrl){
+//	var_dump($db);
+	if($rootId=="")
+		$rootId=null;
+	if($imgUrl=="")
+		$imgUrl=null;
+	$query = <<<SQL
+INSERT INTO `cwsvjudo`.`achievements` (name, rootId, achievementGroupId, level, description, imgUrl)
+VALUES (:name, :rootId, :achievementGroupId, :level, :description, :imgUrl);
+SQL;
+	$params=[
+		':name' => ['value'=>$name, 'data_type'=>PDO::PARAM_STR],
+		':rootId' => ['value'=>$rootId, 'data_type'=>PDO::PARAM_INT],
+		':achievementGroupId' => ['value'=>$achievementGroupId, 'data_type'=>PDO::PARAM_INT],
+		':level' => ['value'=>$level, 'data_type'=>PDO::PARAM_INT],
+		':description' => ['value'=>$description, 'data_type'=>PDO::PARAM_STR],
+		':imgUrl' => ['value'=>$imgUrl, 'data_type'=>PDO::PARAM_STR],
+	];
+	dbQuery($db, $query, $params, ['dontFetch'=>true]);
+return;
+}
+
+function addAchievementGroup($db, $name, $unlockingAchievementId, $imgUrl){
+	if($unlockingAchievementId=="")
+		$unlockingAchievementId=null;
+	if($imgUrl=="")
+		$imgUrl=null;
+	$query = <<<SQL
+INSERT INTO `cwsvjudo`.`machs_achievementGroups` (name, unlockingAchievementId, imgUrl)
+VALUES (:name, :unlockingAchievementId, :imgUrl);
+SQL;
+	$params=[
+		':name' => ['value'=>$name, 'data_type'=>PDO::PARAM_STR],
+		':unlockingAchievementId' => ['value'=>$unlockingAchievementId, 'data_type'=>PDO::PARAM_INT],
+		':imgUrl' => ['value'=>$imgUrl, 'data_type'=>PDO::PARAM_STR],
+	];
+	dbQuery($db, $query, $params, ['dontFetch'=>true]);
+return;
+}
+
+function updateAchievement($db, $achievementId, $name, $rootId, $achievementGroupId, $level, $description, $imgUrl){
+	if($rootId=="")
+		$rootId=null;
+	if($imgUrl=="")
+		$imgUrl=null;
+	$query = <<<SQL
+UPDATE `cwsvjudo`.`achievements` 
+SET name=:name, rootId=:rootId, achievementGroupId=:achievementGroupId, level=:level, description=:description, imgUrl:=imgUrl
+WHERE `id`=:achievementId;
+SQL;
+	$params=[
+		':name' => ['value'=>$name, 'data_type'=>PDO::PARAM_STR],
+		':achievementGroupId' => ['value'=>$achievementGroupId, 'data_type'=>PDO::PARAM_INT],
+		':rootId' => ['value'=>$rootId, 'data_type'=>PDO::PARAM_INT],
+		':level' => ['value'=>$level, 'data_type'=>PDO::PARAM_INT],
+		':description' => ['value'=>$description, 'data_type'=>PDO::PARAM_STR],
+		':imgUrl' => ['value'=>$imgUrl, 'data_type'=>PDO::PARAM_STR],
+		':achievementId' => ['value'=>$achievementId, 'data_type'=>PDO::PARAM_INT],
+	];
+	dbQuery($db, $query, $params, ['dontFetch'=>true]);
+return;
+}
+
+function updateAchievementGroup($db, $achievementGroupId, $name, $unlockingAchievementId, $imgUrl){
+	if($unlockingAchievementId=="")
+		$unlockingAchievementId=null;
+	if($imgUrl=="")
+		$imgUrl=null;
+	$query = <<<SQL
+UPDATE `cwsvjudo`.`machs_achievementGroups` 
+SET name=:name, rootId=:rootId, achievementGroupId=:achievementGroupId, level=:level, description=:description, imgUrl:=imgUrl
+WHERE `id`=:achievementGroupId;
+SQL;
+	$params=[
+		':achievementGroupId' => ['value'=>$achievementGroupId, 'data_type'=>PDO::PARAM_INT],
+		':name' => ['value'=>$name, 'data_type'=>PDO::PARAM_STR],
+		':unlockingAchievementId' => ['value'=>$unlockingAchievementId, 'data_type'=>PDO::PARAM_INT],
+		':imgUrl' => ['value'=>$imgUrl, 'data_type'=>PDO::PARAM_STR],
+	];
+	dbQuery($db, $query, $params, ['dontFetch'=>true]);
+return;
+}
+
+function setBday($db, $userId, $bday){
+	$query = <<<SQL
+UPDATE `cwsvjudo`.`wkParticipo_Users` 
+SET gebDatum=:bday 
+WHERE `id`=:userId;
+SQL;
+	$params=[
+		':bday' => ['value'=>$bday, 'data_type'=>PDO::PARAM_STR],
+		':userId' => ['value'=>$userId, 'data_type'=>PDO::PARAM_INT]
+	];
+	dbQuery($db, $query, $params, ['dontFetch'=>true]);
+return;
+}
+
+function setRecord($db, $userId, $achievementGroupId, $value){
+$u = getUserData($db, $userId);
+	$query = <<<SQL
+INSERT `cwsvjudo`.`machs_records` 
+SET achievementGroupId=:achievementGroupId, ageClass=:ageClass, userId=:userId, value=:value
+SQL;
+	$params=[
+		':achievementGroupId' => ['value'=>$achievementGroupId, 'data_type'=>PDO::PARAM_INT],
+		':ageClass' => ['value'=>record::birthday2ageClass($u['gebDatum']), 'data_type'=>PDO::PARAM_INT], 
+		':userId' => ['value'=>$userId, 'data_type'=>PDO::PARAM_INT], 
+		':value' => ['value'=>$value, 'data_type'=>PDO::PARAM_INT], 
+	];
+	dbQuery($db, $query, $params, ['dontFetch'=>true]);
+//var_dump($userId, $achievementGroupId, $value);
+//var_dump($query, $params);
+return;
+}
+
+function canUserGetAchievementToday($db, $userId){
+	$achievements = getUsersAchievements($db, $userId);
+	foreach($achievements as $a){
+		if( date('Ymd') == date('Ymd', strtotime($a['timestamp'])) ){
+			return false;
+		}
+	}
+return true;
+}
+
+?>
diff --git a/homepage/participo/lib/participoLib/participo.php b/homepage/participo/lib/participoLib/participo.php
new file mode 100644
index 0000000..b0eaa15
--- /dev/null
+++ b/homepage/participo/lib/participoLib/participo.php
@@ -0,0 +1,208 @@
+<?php
+
+/**
+ * Action element of an MaterializeCss (App-)card
+ */
+class AppCardAction{
+	private $caption = null; //< Caption for the action
+	private $link    = "."; //< link for the action
+	/**
+	 * Constructor for the AppAction
+	 *
+	 * @param string $caption caption for the action
+	 * @param string $link link to the action
+	 */
+	function __construct( $caption, $link = "." ){
+		//! @todo input sanitation
+		$this->link    = $link;
+		$this->caption = $caption;
+	}
+	/**
+	 * Create htmlCode for the action
+	 *
+	 * @return string with htmlCode of the action
+	 */
+	function htmlCode(){
+		return "<a href=\"".$this->link."\">".$this->caption."</a>";
+	}
+	/**
+	 * Create AppCardAction from assoziative array
+	 *
+	 * @param array $member array with the member values
+	 * @return AppCardAction
+	 */
+	static public function fromArray($member){
+		$caption = $member['caption'] ?? null;
+		$link    = $member['link']    ?? ".";
+		return new AppCardAction($caption, $link);
+	}
+}
+
+/**
+ * MaterializeCss card for an App
+ */
+class AppCard{
+	private $title = ""; //< title of the card
+	private $description = ""; //< description of the App
+	private $link = null; //< link for the card-content
+	private $imgUrl = null; //< url for an image right under the title
+	private $actionList = []; //< list of actions for the bottom of the card
+	/**
+	 * Constructor for the AppCard
+	 *
+	 * @param string $title title of the card
+	 * @param string $description description of the card
+	 * @param string $link link for the card-content
+	 * @param string $imgUrl url for an image right under the title
+	 * @param array $actionList list of actions at the bottom of the card
+	 */
+	function __construct($title, $description, $link=null, $imgUrl=null, $actionList=[]){
+		//! @todo input sanitation
+		$this->title = $title;
+		$this->description = $description;
+		$this->link = $link;
+		$this->imgUrl = $imgUrl;
+		$this->actionList = $actionList;
+	}
+	/**
+	 * Create htmlCode for the AppCard
+	 *
+	 * @return string html code for the AppCard
+	 */
+	public function htmlCode($options=[]){
+		$extraClass = $options['extraClass'] ?? "";
+		$actionListCode = "";
+		foreach($this->actionList as $a){
+			$actionListCode .= $a->htmlCode();
+		}
+		return
+			"<div style=\"padding:1%;\" class=\"col s12 m6 ".$extraClass."\">".
+			 "<div style=\"margin:1%;\" class=\"card blue-grey darken-1\">".
+			  (($this->link!=null)?("<a href=\"".$this->appLink."\">"):(""))."<div class=\"card-content white-text\">".
+			   "<span class=\"card-title\">".$this->title."</span>".
+			   (($this->imgUrl!=null)?("<img style=\"display:block;margin-left:auto;margin-right:auto;max-height:10vh;\" class=\"responsive-img\" src=\"".$this->imgUrl."\" />"):("")).
+			   "<p>".$this->description."</p>".
+			  "</div>".(($this->link!=null)?("<a>"):("")).
+			  "<div class=\"card-action\">".$actionListCode."</div>".
+			 "</div>".
+			"</div>";
+	}
+	/**
+	 * Create AppCard from an associative array
+	 *
+	 * @param array $member array with member as keys and values as the member values 
+	 * @return AppCard from array values
+	 */
+	static public function fromArray($member){
+		$title       = $member['title']       ?? "";
+		$description = $member['description'] ?? "";
+		$link        = $member['link']        ?? null;
+		$imgUrl      = $member['imgUrl']      ?? null;
+		$actionList  = $member['actions']     ?? [];
+
+		return new AppCard($title, $description, $link, $imgUrl, $actionList);
+	}
+}
+
+/**
+ * Generate a html table of the last logins of the users
+ *
+ * @param string $jsonFileName path to the json file with the logged logins 
+ * @return string Html table of users last logins
+ */
+function lastLoginTable($jsonFileName="lastLogins.json"){
+	$lastLogins=json_decode( file_get_contents($jsonFileName), true);
+	$lastLoginsTable = 
+		"<table>".
+		 "<thead><tr><th>userName</th><th>lastLogins</th></tr></thead>".
+		 "<tbody>";
+	foreach( $lastLogins as $userName => $lastLogins ){
+		$lastLoginsTable .=
+			"<tr><td>".$userName."</td><td>".$lastLogins['lastLogins'][0]."</td></tr>";
+	}
+	$lastLoginsTable .= "</tbody></table>";
+	return $lastLoginsTable;
+}
+
+/// Eine Fehler/Warnung/Notiz/Erfolgsmeldung als divBox im String zurückgeben
+function htmlRetMessage($anRetMessage){
+$retHtmlString = "";
+if( !empty($anRetMessage) ){
+	$retHtmlString .= "<div style=\"border: 1px solid;\">";
+	if( !empty($anRetMessage['error']) ){
+		$retHtmlString .= "<div style=\"border: 1px solid;\">";
+		$retHtmlString .= "ERROR:<br />";
+		$retHtmlString .= $anRetMessage['error'];
+		$retHtmlString .= "</div>";
+	}
+	if( !empty($anRetMessage['warning']) ){
+		$retHtmlString .= "<div style=\"border: 1px solid;\">";
+		$retHtmlString .= "WARNING:<br />";
+		$retHtmlString .= $anRetMessage['warning'];
+		$retHtmlString .= "</div>";
+	}
+	if( !empty($anRetMessage['notice']) ){
+		$retHtmlString .= "<div style=\"border: 1px solid;\">";
+		$retHtmlString .= "Info:<br />";
+		$retHtmlString .= $anRetMessage['notice'];
+		$retHtmlString .= "</div>";
+	}
+	if( !empty($anRetMessage['success']) ){
+		$retHtmlString .= "<div style=\"border: 1px solid;\">";
+		$retHtmlString .= "SUCCESS:<br />";
+		$retHtmlString .= $anRetMessage['success'];
+		$retHtmlString .= "</div>";
+	}
+	$retHtmlString .= "</div>";
+}
+return $retHtmlString;
+}
+
+/**
+ * load a MarkdownFile with yaml header
+ *
+ * @param string $fileName filename of the markdown file
+ * @return array assocative array('yaml'=>array(..), 'mdText'=>string) containing the yamlHeader as associative array and the markdown text as string
+ */
+function loadMarkdownFile($fileName){
+	// load the whole file
+	$fileText = file_get_contents($fileName);
+	// split at '---' to get ((),yamls,array)
+	$fileParts = preg_split('/[\n]*[-]{3}[\n]/', $fileText, 3);
+	// not all mdfiles have a yamlHeader, so the mdText can be at different indices 
+	$yaml=[];
+	$mdText = "";
+	switch( count($fileParts) ){
+		case 1:{
+			$mdText = $fileParts[0];
+			break;
+		}
+		case 3:{
+			$yaml = Spyc::YAMLLoadString($fileParts[1]);
+			$mdText = $fileParts[2];
+			break;
+		}
+		default:{
+			$mdText = $fileText;
+		}
+
+	}
+	// get a title, if none is in the markdown
+	if(!array_key_exists('title', $yaml)){
+		// find the first heading, set it as header and remove it from the markdown
+		if( preg_match("/^#(.*)$/m", $mdText, $matches) ){
+			$yaml['title'] = $matches[1];
+			$mdText = preg_replace("/^#(.*)$/m", "", $mdText, 1);
+		}
+		else{
+			// fallback for the title, if not even one heading is found
+			$yaml['title'] = "<fehlender Titel>";
+		}
+	}
+
+	return array(
+		'yaml' => $yaml
+		, 'mdText' => $mdText
+	);
+}
+?>
\ No newline at end of file
diff --git a/homepage/redesign2018/json/.upload/cwsvJudo-Links.json b/homepage/participo/lib/userConfig.php
similarity index 100%
rename from homepage/redesign2018/json/.upload/cwsvJudo-Links.json
rename to homepage/participo/lib/userConfig.php
diff --git a/homepage/participo/local/.htaccess b/homepage/participo/local/.htaccess
new file mode 100644
index 0000000..3a42882
--- /dev/null
+++ b/homepage/participo/local/.htaccess
@@ -0,0 +1 @@
+Deny from all
diff --git a/homepage/participo/local/achievementsConf.php b/homepage/participo/local/achievementsConf.php
new file mode 100644
index 0000000..3517089
--- /dev/null
+++ b/homepage/participo/local/achievementsConf.php
@@ -0,0 +1,10 @@
+<?php
+// Die Domains, Basedomain und Subdomain sind nicht wörtlich zu nehmen
+// effektiv ist es einfach eine Zweiteilung des Domainnamens
+	$wkParticipoConf['baseDomain'] = "cwsvjudo.bplaced.net";
+	$wkParticipoConf['subDomain'] = "";
+/// Basis(/Root)-Verzeichnis auf dem Server (für Dateizugriffe, insbesondere phpIncludes)
+	$wkParticipoConf['basePath'] = "/users/cwsvjudo/www";
+	$wkParticipoConf['rootDir'] = "/pages/desktop/wkParticipo";
+	$wkParticipoConf['adminEmail'] = "cwsvjudo@arcor.de";
+?>
diff --git a/homepage/participo/local/cwsvJudo.php b/homepage/participo/local/cwsvJudo.php
new file mode 100644
index 0000000..3998c08
--- /dev/null
+++ b/homepage/participo/local/cwsvJudo.php
@@ -0,0 +1,6 @@
+<?php
+$cwsvJudoConfig["db"]["host"]     = "localhost";
+$cwsvJudoConfig["db"]["name"]     = "cwsvjudo";
+$cwsvJudoConfig["db"]["user"]     = "cwsvjudo";
+$cwsvJudoConfig["db"]["password"] = "***REMOVED***";
+?>
diff --git a/homepage/participo/local/dbConf.php b/homepage/participo/local/dbConf.php
new file mode 100644
index 0000000..97efeba
--- /dev/null
+++ b/homepage/participo/local/dbConf.php
@@ -0,0 +1,8 @@
+<?php
+
+$db_server='localhost';
+$db_user='cwsvjudo';
+$db_password='***REMOVED***';
+$db_name='cwsvjudo';
+
+?>
diff --git a/homepage/participo/login.php b/homepage/participo/login.php
new file mode 100644
index 0000000..aae2fb5
--- /dev/null
+++ b/homepage/participo/login.php
@@ -0,0 +1,136 @@
+<?php
+setlocale (LC_ALL, 'de_DE@euro', 'de_DE', 'de', 'ge');
+
+    require_once("lib/participoLib/participo.php");
+	require_once("config/participo.php");
+	
+	require_once("./local/dbConf.php");
+
+	$basePath = $config['basePath'];
+	require_once($basePath."/config/phpcount.config.php");
+	require_once($basePath."/ressourcen/phpLib/phpcount/phpcount.php");
+
+
+function checkCredentials($username, $password, $db_server, $db_user, $db_password, $db_name){
+    sleep(1);
+	$mysqli = @new mysqli($db_server, $db_user, $db_password, $db_name);
+	if ($mysqli->connect_error) {
+		$message['error'] = 'Datenbankverbindung fehlgeschlagen: ' . $mysqli->connect_error;
+	} else {
+		$query = sprintf(
+			"SELECT id, loginName, pwHash, config FROM wkParticipo_Users WHERE loginName = '%s'",
+			$mysqli->real_escape_string($_POST['f']['username'])
+		);
+		$result = $mysqli->query($query);
+		if ($row = $result->fetch_array(MYSQLI_ASSOC)) {
+			if( password_verify( $_POST['f']['password'], $row['pwHash']) ){
+				session_start();
+				$_SESSION = array(
+					'login' => true,
+					'user'  => array(
+						'username'  => $row['loginName'],
+						'userId' => $row['id'],
+						'userConfig' => json_decode($row['config'], true)
+					),
+				);
+				$message['success'] = 'Anmeldung erfolgreich, <a href="index.php">weiter zum Inhalt</a>.';				
+				PHPCount::AddHit("participo-Login-".$_POST['f']['username']);
+
+				// Logging Logins
+				logLoginsToJsonFile($_SESSION['user']['username']);
+				
+				header('Location: http://' . $_SERVER['HTTP_HOST'] . '/participo?user=' . $_POST['f']['username']);
+			} else {
+				sleep(5);
+				$message['error'] = 'Das Kennwort ist nicht korrekt.';
+			}
+		}
+	}
+return $message;
+}
+
+/**
+ * Log the Login of an user into a logFile
+ *
+ * @param string $userName name of the user
+ * @param string $fileName filename to log to
+ * @return void
+ */
+function logLoginsToJsonFile($userName, $fileName="lastLogins.json"){
+	try{
+		$lastLogins = json_decode(file_get_contents($fileName), true);
+		if(!array_key_exists($userName, $lastLogins))
+			$lastLogins[$userName] = [];
+		if(!array_key_exists('lastLogins', $lastLogins[$userName]))
+			$lastLogins[$userName]['lastLogins'] = [];
+		$lastLogins[$userName]['lastLogins'] = array_merge( array( date('Y-m-d H:i:s') ), $lastLogins[$userName]['lastLogins'] );
+		file_put_contents($fileName, json_encode($lastLogins));
+	}
+	catch (Exception $e){
+		// silently ignore errors
+	}
+}
+
+if (isset($_SESSION['login'])) {
+	header('Location: http://' . $_SERVER['HTTP_HOST'] . '/index.php');
+}
+else{
+	if (!empty($_POST)) {
+		if (
+			empty($_POST['f']['username']) ||
+			empty($_POST['f']['password'])
+		) {
+			$message['error'] = 'Es wurden nicht alle Felder ausgefüllt.';
+		} else {
+			
+			$message = checkCredentials($_POST['f']['username'], $_POST['f']['password'], $db_server, $db_user, $db_password, $db_name);
+			if( !isset($message['error']) )
+				$message['notice'] = "OnlineApps - cwsvJudo";
+		}
+	}
+}
+
+?>
+<!DOCTYPE html>
+<html>
+	<head>
+		<meta charset="utf-8" />
+		<meta name="viewport" content="width=device-width, initial-scale=1.0" />
+
+		<!-- Materialize: Compiled and minified CSS -->
+		<link rel="stylesheet" href="https://cdnjs.cloudflare.com/ajax/libs/materialize/1.0.0/css/materialize.min.css">
+		<!-- Materialize: Compiled and minified JavaScript -->
+		<script src="https://cdnjs.cloudflare.com/ajax/libs/materialize/1.0.0/js/materialize.min.js"></script>
+
+		<title>Login des Achievementsystemes der Judoka des Chemnitzer WSV</title>
+		<meta name="description" content="Loginseite der Online-Apps der Judoka des CWSV">
+	</head>
+    <body class="container">
+		<h1>Loginseite der Online-Apps der Judoka des CWSV</h1>
+		<?php echo(htmlRetMessage($message));?>
+		<form action="./login.php" method="post">
+			<fieldset>
+				<legend>Benutzerdaten</legend>
+				<div>
+					<label for="username">Benutzername</label>
+					<input  id="username"type="text" name="f[username]" <?php echo isset($_POST['f']['username']) ? ' value="' . htmlspecialchars($_POST['f']['username']) . '"' : '' ?> />
+				</div>
+				<div>
+					<label for="password">Kennnwort</label>
+					<input  id="password" type="password" name="f[password]" />
+				</div>
+			</fieldset>
+			<fieldset>
+				<div>
+					<button type="submit" name="submit" value="Anmelden">Anmelden</button>
+				</div>
+			</fieldset>
+			<fieldset class="notice"><legend>Hinweise</legend>
+				<ul style="padding-left: inherit;">
+					<li style="list-style-type: circle;" >Logindaten sind über den Übungsleiter zu beantragen.</li>
+					<li style="list-style-type: circle;" >Dieses Projekt ist in mehr oder weniger aktiven Entwicklung. Sollte mal was nicht funktionieren, kann es sein, dass ich gerade daran herumschreibe. Also ruhig zu einem späteren Zeitpunkt noch einmal probieren.</li>
+				</ul>
+			</fieldset>
+		</form>
+	</body>
+</html>
diff --git a/homepage/participo/logout.php b/homepage/participo/logout.php
new file mode 100644
index 0000000..f6ee446
--- /dev/null
+++ b/homepage/participo/logout.php
@@ -0,0 +1,18 @@
+<?php
+	session_start();
+	$_SESSION = array();
+	if (ini_get('session.use_cookies')) {
+		$params = session_get_cookie_params();
+		setcookie(
+			session_name(),
+			'',
+			time() - 42000,
+			$params['path'],
+			$params['domain'],
+			$params['secure"'],
+			$params['httponly']
+		);
+	}
+	session_destroy();
+	header('Location: ./login.php');
+?>
diff --git a/homepage/participo/markdown b/homepage/participo/markdown
new file mode 120000
index 0000000..6e27b25
--- /dev/null
+++ b/homepage/participo/markdown
@@ -0,0 +1 @@
+../../DieJudoGürtelprüfung/markdown/
\ No newline at end of file
diff --git a/homepage/participo/shared/imports.php b/homepage/participo/shared/imports.php
new file mode 100644
index 0000000..0243b8c
--- /dev/null
+++ b/homepage/participo/shared/imports.php
@@ -0,0 +1,8 @@
+<!-- Compiled and minified CSS -->
+<link rel="stylesheet" href="https://cdn.jsdelivr.net/npm/@materializecss/materialize@1.1.0-alpha/dist/css/materialize.min.css">
+<!-- Compiled and minified JavaScript -->
+<script src="https://cdn.jsdelivr.net/npm/@materializecss/materialize@1.1.0-alpha/dist/js/materialize.min.js"></script>
+<!--Import Google Icon Font-->
+<link rel="stylesheet" href="https://fonts.googleapis.com/icon?family=Material+Icons">
+<!-- participo specific style adjustments -->
+<link rel="stylesheet" href="css/participo.css">
diff --git a/homepage/participo/sidenav.php b/homepage/participo/sidenav.php
new file mode 100644
index 0000000..9cff98f
--- /dev/null
+++ b/homepage/participo/sidenav.php
@@ -0,0 +1,22 @@
+<?php 
+	if($_SESSION['login']){ 
+?>
+		<ul id="slide-out" class="sidenav">
+			<li><div class="user-view">
+				<div class="background">
+					<img src="images/office.jpg">
+				</div>
+				<a href="#user"><img class="circle" src="images/yuna.jpg"></a>
+				<a href="#name"><span class="white-text name">John Doe</span></a>
+				<a href="#email"><span class="white-text email">jdoe@example.com</span></a>
+			</div></li>
+			<li><a href="#!"><i class="material-icons">cloud</i>First Link With Icon</a></li>
+			<li><a href="#!">Second Link</a></li>
+			<li><div class="divider"></div></li>
+			<li><a class="subheader">Subheader</a></li>
+			<li><a class="waves-effect" href="#!">Third Link With Waves</a></li>
+		</ul>
+		<a href="#" data-target="slide-out" class="sidenav-trigger"><i class="material-icons">menu</i></a>
+<?php
+	}
+?>
\ No newline at end of file
diff --git a/homepage/participo/sidenav/backToMain.php b/homepage/participo/sidenav/backToMain.php
new file mode 100644
index 0000000..617c490
--- /dev/null
+++ b/homepage/participo/sidenav/backToMain.php
@@ -0,0 +1 @@
+<li><a href=".">zurück zur Hauptseite</a></li>
diff --git a/homepage/participo/sidenav/kyu.php b/homepage/participo/sidenav/kyu.php
new file mode 100644
index 0000000..eb92103
--- /dev/null
+++ b/homepage/participo/sidenav/kyu.php
@@ -0,0 +1,15 @@
+<li>
+    <a href="kyu.php?kyu=8">8. Kyu - weiß-gelb</a>
+</li>
+<li>
+    <a href="kyu.php?kyu=7">7. Kyu - gelb</a>
+</li>
+<li>
+    <a href="kyu.php?kyu=6">6. Kyu - gelb-orange</a>
+</li>
+<li>
+    <a href="kyu.php?kyu=5">5. Kyu - orange</a>
+</li>
+<li>
+    <a href="kyu.php?kyu=4">4. Kyu - orange-grün</a>
+</li>
diff --git a/homepage/participo/sidenav/loginStatus.php b/homepage/participo/sidenav/loginStatus.php
new file mode 100644
index 0000000..27e53ac
--- /dev/null
+++ b/homepage/participo/sidenav/loginStatus.php
@@ -0,0 +1,6 @@
+<li>
+    Angemeldet als <?php echo($_SESSION['user']['username']); ?>
+</li>
+<li>
+    <a href="./logout.php">Logout</a>
+</li>
\ No newline at end of file
diff --git a/homepage/participo/user.php b/homepage/participo/user.php
new file mode 100644
index 0000000..2289dd6
--- /dev/null
+++ b/homepage/participo/user.php
@@ -0,0 +1,248 @@
+<?php
+setlocale (LC_ALL, 'de_DE@euro', 'de_DE', 'de', 'ge');
+	require_once("config/participo.php");
+	
+	require_once("./local/dbConf.php");
+	require_once("./local/cwsvJudo.php");
+
+	require_once("./lib/db.php");
+	require_once("./lib/api.php");
+
+	require_once("./auth.php");
+
+	require_once($config['basePath']."/config/cwsvJudo.config.php");
+	require_once($config['basePath']."/config/phpcount.config.php");
+	
+	$dbConnection = getPdoDbConnection(
+		$cwsvJudoConfig["db"]["host"], 
+		$cwsvJudoConfig["db"]["name"], 
+		$cwsvJudoConfig["db"]["user"],
+		$cwsvJudoConfig["db"]["password"]
+	);
+	
+	$userData = getUserData($dbConnection, $_SESSION['user']['userId']);
+	$usersKids = getUsersKids($dbConnection, $_SESSION['user']['userId']);
+
+	processPostData($dbConnection, $_POST);
+
+?>
+<!DOCTYPE html>
+<html>
+	<head>
+		<meta charset="utf-8" />
+		<meta name="viewport" content="width=device-width, initial-scale=1.0" />
+
+<?php
+		readfile("./shared/imports.php");
+?>
+		<!-- inits for the materializeCss -->
+		<script>
+			document.addEventListener('DOMContentLoaded', function() {
+				var elems = document.querySelectorAll('.sidenav');
+				var instances = M.Sidenav.init(elems, {
+					// specify options here
+				});
+			});
+		</script>
+
+		<title>User-Config</title>
+		<meta name="description" content="Benutzereinstellungen">
+
+		<link rel="icon"             href="<?echo($config['ressourceUrl']);?>/graphiken/icons/cwsv.ico" />
+		<link rel="apple-touch-icon" href="<?echo($config['baseUrl']);?>/apple-touch-icon.png">
+	</head>
+
+	<body>
+
+		<header>
+			<nav class="indigo darken-4">cwsvJudo Apps<a class="right top-nav sidenav-trigger waves-effect waves-light hide-on-large-only" href="#" data-target="nav-mobile">
+				<i class="material-icons">menu</i>
+			</a></nav>
+			<ul class="sidenav sidenav-fixed sidenav-close" id="nav-mobile">
+				<li class="logo">
+					<a style="height:auto;" class="brand-logo" id="logo-container" href="/participo/">
+						<img style="max-width:100%;height:12vh;" class="responsive-img" src="http://cwsvjudo.bplaced.net/ressourcen/graphiken/logos/cwsvJudoLogoWappen.x256.png" />
+					</a>
+				</li>
+				<li><?php require_once("sidenav/loginStatus.php");?></li>
+				<li class="bold">
+					<a class="waves-effect waves-teal" href="/participo">zurück</a>
+				</li>
+				<li class="bold">
+					<a class="waves-effect waves-teal" href="/participo/user#userInfos">Config</a>
+				</li>
+				<li class="bold">
+					<a class="waves-effect waves-teal" href="/participo/user#kidsList">Kinder</a>
+				</li>
+			</ul>
+		</header>
+
+<?php
+if($_SESSION['login']){
+?>
+		<main>
+			<h1>Benutzer-Einstellungen</h1>
+			<p>
+<?php
+		if( array_key_exists('changePasswordSuccess', $_GET) ){
+			if($_GET['changePasswordSuccess'] == "true"){
+				echo("<div>Password geändert</div>");
+			}else{
+				echo("<div>Fehler während setzens des Passwortes.</div>");
+			}
+		}
+?>
+			</p>
+			<h2>Benutzer-Info</h2>
+			<p>Informationen zum eigenen Benutzerkonto</p>
+			<div id="userInfos" class="row">
+
+				<div style="padding:1%;" class="col s12 m6">
+					<div style="margin:1%;" class="card blue-grey darken-1">
+						<div class="card-content white-text">
+							<span class="card-title"><?php echo($userData['name']);?>, <?php echo($userData['vorname']); ?></span>
+							<img style="max-height:10vh;" class="responsive-img" src="images/account.svg" />
+							<dl>
+								<dt>Name</dt><dd><?php echo($userData['name']); ?></dd>
+								<dt>Vorname</dt><dd><?php echo($userData['vorname']); ?></dd>
+								<dt>Email</dt><dd><?php echo($userData['eMail']); ?></dd>
+							</dl>
+						</div>
+					</div>
+					<div class="card-action">
+<!--
+						<a href="">kommt bald</a>
+-->
+					</div>
+				</div>
+
+				<div style="padding:1%;" class="col s12 m6">
+					<div style="margin:1%;" class="card blue-grey darken-1">
+						<div class="card-content white-text">
+							<span class="card-title">Passwort setzen</span>
+							Im folgenden Formular kann das Passwort geändert werden. Man sollte darauf achten, dass man beim <a href="https://www.bsi-fuer-buerger.de/BSIFB/DE/Empfehlungen/Passwoerter/Umgang/umgang_node.html">Umgang mit Passwörtern</a> die nötige Vorsicht walten lässt.
+							<form action="./user" method="post">
+								<input name="action" type="hidden" value="changePassword" />
+								<input name="redirectLocation" type="hidden" value="./user" />
+								<input name="changerId" type="hidden" value="<?php echo($userData['id']); ?>" />
+								<input name="changeeId" type="hidden" value="<?php echo($userData['id']); ?>" />
+								<fieldset>
+									<legend>Neues Passwort vergeben</legend>
+									<div>
+										<label for="changerPassword">Eigenes Passwort</label>
+										<input type="password" name="changerPassword" id="changerPassword" />
+									</div>
+									<div>
+										<label for="newPassword">Neues Passwort</label>
+										<input type="password" name="newPassword" id="newPassword" />
+									</div>
+									<div>
+										<label for="newPasswordAgain">Neues Passwort wiederholen</label>
+										<input type="password" name="newPasswordAgain" id="newPasswordAgain" />
+									</div>
+								</fieldset>
+								<fieldset>
+									<div><button type="submit">Passwort neu setzen</button></div>
+								</fieldset>
+							</form>
+						</div>
+					</div>
+					<div class="card-action">
+<!--
+						<a href="">kommt bald</a>
+-->
+					</div>
+				</div>
+			</div>
+
+			<h2>Berechtigungen</h2>
+			
+			<p>Liste der User, für die man meldeberechtigt ist (bzw. Änderungen vornehmen darf). In der Regel ist das das eigene Kind (bei Eltern) oder man selber (bei Volljährigen).</p>
+			<div class="row" id="kidsList">
+<?php
+	foreach($usersKids as $kid){ ?>
+				<div style="padding:1%;" class="col s12 m6">
+					<div style="margin:1%;" class="card blue-grey darken-1">
+						<div class="card-content white-text">
+							<span class="card-title"><?php echo($kid['name']);?>, <?php echo($kid['vorname']); ?></span>
+							<img style="max-height:10vh;" class="responsive-img" src="images/account.svg" />
+							<dl>
+								<dt>Name</dt><dd><?php echo($kid['name']); ?></dd>
+								<dt>Vorname</dt><dd><?php echo($kid['vorname']); ?></dd>
+								<dt>Geb.datum</dt><dd><?php echo($kid['gebDatum']); ?></dd>
+							</dl>
+						</div>
+
+						<span class="card-title">Passwort</span>
+						<p>Im folgenden Formular kann das Passwort des Kindes gesetzt werden. Das eigene Passwort muss dabei noch einmal zur Kontrolle eingegeben werden. Das neue Passwort muss zweimal blind eingegeben.</p>
+						<p>
+<?php
+						if( ($kid['pwHash'] == "") || ($kid['pwHash']) == NULL ){
+							echo("<p>Derzeit ist kein Passwort gesetzt!</p>");
+						}
+						else{
+							echo("<p>Es ist derzeit ein Passwort gesetzt!</p>");
+?>
+						<p>Es besteht auch die Möglickeit, das Passwort ganz zu entfernen. Man kann sich dann nicht mehr mit diesem Konto einloggen. Das eigene Passwort muss dabei noch einmal zur Kontrolle eingegeben werden.</p>
+						<form action="./user" method="post">
+							<input name="action" type="hidden" value="changePassword" />
+							<input name="redirectLocation" type="hidden" value="./user" />
+							<input name="changerId"   type="hidden" value="<?php echo($userData['id']); ?>" />
+							<input name="changeeId"   type="hidden" value="<?php echo($kid['kidId']); ?>" />
+							<input name="newPassword" type="hidden" value="" />
+							<input name="newPasswordAgain" type="hidden" value="" />
+							<fieldset>
+								<div>
+									<label for="changerPassword">Eigenes Passwort</label>
+									<input type="password" name="changerPassword" id="changerPassword" />
+								</div>
+							</fieldset>
+							<fieldset>
+								<div><button type="submit">Passwort entfernen</button></div>
+							</fieldset>
+						</form>
+<?php
+						}
+?>
+						</p>
+						<form action="./user" method="post">
+							<input name="action" type="hidden" value="changePassword" />
+							<input name="redirectLocation" type="hidden" value="./user" />
+							<input name="changerId" type="hidden" value="<?php echo($userData['id']); ?>" />
+							<input name="changeeId" type="hidden" value="<?php echo($kid['kidId']); ?>" />
+							<fieldset>
+								<legend>Neues Passwort vergeben</legend>
+								<div>
+									<label for="changerPassword">Eigenes Passwort</label>
+									<input type="password" name="changerPassword" id="changerPassword" />
+								</div>
+								<div>
+									<label for="newPassword">Neues Passwort des Kindes</label>
+									<input type="password" name="newPassword" id="newPassword" />
+								</div>
+								<div>
+									<label for="newPasswordAgain">Neues Passwort wiederholen</label>
+									<input type="password" name="newPasswordAgain" id="newPasswordAgain" />
+								</div>
+							</fieldset>
+							<fieldset>
+								<div><button type="submit">Passwort neu setzen</button></div>
+							</fieldset>
+						</form>
+						
+						<div class="card-action">
+<!--
+							<a href="">kommt bald</a>
+-->
+						</div>
+					</div>
+				</div>
+<?php
+	}
+?>
+		</main>
+<?php
+}
+?>
+	</body>
+</html>
diff --git a/homepage/redesign2018/.gitignore b/homepage/redesign2018/.gitignore
deleted file mode 100644
index 36c9582..0000000
--- a/homepage/redesign2018/.gitignore
+++ /dev/null
@@ -1,2 +0,0 @@
-markdownExperiment/build/*
-temp/*
diff --git a/homepage/redesign2018/Makefile b/homepage/redesign2018/Makefile
deleted file mode 100644
index 540a7d6..0000000
--- a/homepage/redesign2018/Makefile
+++ /dev/null
@@ -1,34 +0,0 @@
-cssFiles=$(wildcard css/*.css)
-phpFiles=$(wildcard php/*.php)
-phpUploads=$(patsubst php/%, php/.upload/%, $(phpFiles))
-jsonFiles=$(wildcard json/*.json)
-jsonUploads=$(patsubst json/%, json/.upload/%, $(jsonFiles))
-
-all: phpUpload jsonUpload build/cwsvJudo-2018.css
-
-clean:
-
-build/cwsvJudo-2018.css: $(cssFiles)
-	mkdir -p build
-	cat css/*.css | cleancss -o build/cwsvJudo-2018.css
-	curl -T build/cwsvJudo-2018.css -u cwsvjudo:***REMOVED*** ftp://cwsvjudo.bplaced.net/ressourcen/css/cwsvJudo-2018.css
-
-.PHONY: phpUploads
-phpUpload: $(phpUploads)
-
-php/.upload/%.php: php/%.php
-	mkdir -p php/.upload
-	curl -T $^ -u cwsvjudo:***REMOVED*** ftp://cwsvjudo.bplaced.net/pages/responsive/$(patsubst php/%,%, $^)
-	touch $@
-
-.PHONY: jsonUploads
-jsonUpload: $(jsonUploads)
-
-json/.upload/%.json: json/%.json
-	mkdir -p json/.upload
-	curl -T $^ -u cwsvjudo:***REMOVED*** ftp://cwsvjudo.bplaced.net/ressourcen/json/$(patsubst json/%,%, $^)
-	touch $@
-
-.PHONY: echo
-echo:
-	@echo $(phpFiles) $(jsonFiles)
diff --git a/homepage/redesign2018/css/cwsvJudo-2018-content.css b/homepage/redesign2018/css/cwsvJudo-2018-content.css
deleted file mode 100644
index 3509d9c..0000000
--- a/homepage/redesign2018/css/cwsvJudo-2018-content.css
+++ /dev/null
@@ -1,7 +0,0 @@
-/*
- * Hauptinhalt
- */
-
-#content {
-	background: #FFAE00;
-}
diff --git a/homepage/redesign2018/css/cwsvJudo-2018-footer.css b/homepage/redesign2018/css/cwsvJudo-2018-footer.css
deleted file mode 100644
index 1fd50c3..0000000
--- a/homepage/redesign2018/css/cwsvJudo-2018-footer.css
+++ /dev/null
@@ -1,15 +0,0 @@
-/*
- * Fußzeile
- */
-
-.footerBar{
-	display: flex;
-	flex-direction: row;
-	flex-wrap: wrap;
-	justify-content: center;
-}
-.footerBarLinkButton{
-	border-style: outset;
-	padding: 1vmin;
-}
-
diff --git a/homepage/redesign2018/css/cwsvJudo-2018-header.css b/homepage/redesign2018/css/cwsvJudo-2018-header.css
deleted file mode 100644
index c3e98d3..0000000
--- a/homepage/redesign2018/css/cwsvJudo-2018-header.css
+++ /dev/null
@@ -1,95 +0,0 @@
-/*
- * Die Headerleiste
- */
-
-header {
-	font-family: Orbitron-Medium;
-	text-align: center;
-	clear: both;
-/*	float: left;*/
-	width: 98%;
-	margin: 0 1% 0 1%;
-	background-color: #FF8100;
-}
-
-header img{
-	display: block; /*inline elemente wie img fügen standardmäßig eine bottom margin hinzu (für schriftzeichen, die unter die Grundlinie gehen)*/
-}
-img.styleBannerPromo{
-	width:20%;
-	height:auto;
-	float:left;
-}
-img.styleBannerCwsv{
-	width:17.5%;
-	height:auto;
-	float:right;
-}
-
-
-.cwsvHeader{
-	display: flex;
-	justify-content: space-between;
-	flex-direction: row;
-	align-items: stretch;
-	text-align: center;
-	background-color: #FF8100;
-}
-
-.cwsvHeaderZitat{
-	font-family: "Orbitron-Medium", Impact, Charcoal, sans-serif;
-	padding-top: .2em;/* wg. Orbitron */
-}
-
-.cwsvHeaderTitle{
-	display: flex;
-	flex-direction: column;
-	justify-content: space-around;
-	align-items: center;
-	font-family: "Orbitron-Medium", Impact, Charcoal, sans-serif;
-	padding-top: .2em;
-}
-.cwsvHeaderTitle h1{
-	font-size: 1.5em;
-}
-.cwsvHeaderPromoPic{
-	display: none;
-	height: 5em;
-}
-
-.cwsvHeaderPromoPic img{
-	height: 100%;
-	width: auto;
-}
-.cwsvHeaderLogoPic{
-	height: 5em;
-}
-.cwsvHeaderLogoPic img{
-	height: 100%;
-	width: auto;
-}
-
-/* \0000a0 ist unicode für &nbsp;
- * \00202F ist unicode für &thinsp;*/
-.cwsvHeaderTitle h1::before{
-	content: 'CWSV\0000a0e.\00202FV. - ';
-}
-@media (min-width: 640px){
-	.cwsvHeaderTitle h1::before{
-		content: 'Chemnitzer WSV\0000a0e.\00202FV. - ';
-	}
-}
-@media (min-width: 1280px){
-	.cwsvHeaderTitle h1::before{
-		content: 'Chemnitzer Freizeit- und Wohngebietssportverein\0000a0e.\00202FV. - ';
-	}
-}
-
-
-@media (min-width: 1280px){
-	.cwsvHeaderPromoPic{
-		display: initial;
-	}
-	.cwsvHeaderLogoPic{
-	}
-}
diff --git a/homepage/redesign2018/css/cwsvJudo-2018-layout.css b/homepage/redesign2018/css/cwsvJudo-2018-layout.css
deleted file mode 100644
index e93cef3..0000000
--- a/homepage/redesign2018/css/cwsvJudo-2018-layout.css
+++ /dev/null
@@ -1,75 +0,0 @@
-body{
-	display: flex;
-	flex-direction: column;
-}
-
-body > * {
-	flex-basis: 100%;
-}
-
-.cwsvHeader{
-	order: 1;
-}
-.mainNav{
-	order: 4;
-}
-.subNav{
-	order: 2;
-}
-#content{
-	order: 3;
-}
-.sideNotes{
-	order: 5;
-}
-.footerBar{
-	order: 6;
-}
-
-@media(min-width: 640px) and (max-width: 1279px){
-	body{
-		display: block;
-	}
-	.subNav{
-		float: right;
-		width: 33%;
-	}
-	#content {
-		float: left;
-		width: 67%;
-/*		margin: 1%;
-		padding: 1%;
-*/
-	}
-	.sideNotes{
-		float: right;
-		width: 33%;
-	}
-	.footerBar{
-		clear: both;
-	}
-}
-
-
-@media(min-width: 1280px){
-	body{
-		flex-direction: row;
-		flex-wrap: wrap;
-	}
-	.mainNav{
-		order: 2;
-	}
-	.subNav{
-		order: 3;
-		flex-basis: 25%;
-		align-self: flex-start;
-	}
-	#content{
-		order: 4;
-		flex-basis: 50%;
-	}
-	.sideNotes{
-		align-self: flex-start;
-		flex-basis: 25%;
-	}
-}
diff --git a/homepage/redesign2018/css/cwsvJudo-2018-navBar.css b/homepage/redesign2018/css/cwsvJudo-2018-navBar.css
deleted file mode 100644
index f09acc3..0000000
--- a/homepage/redesign2018/css/cwsvJudo-2018-navBar.css
+++ /dev/null
@@ -1,57 +0,0 @@
-/* 
- * Haupt-Navigationsleiste
-*/
-
-.mainNav{
-	display: inline-flex;
-	width: 98%;
-	margin: 1% 1% 1% 1%;
-	flex-direction: column;
-	align-items: stretch;
-/*
-	background: #FF8100;
-*/
-}
-.mainNavElement{
-	font-family: "Orbitron-Medium", Impact, Charcoal, sans-serif;
-	padding-top: .2em;/* wg. Orbitron */
-	font-size: 1.5em;
-	text-align: center;
-	text-decoration: none;
-	border-radius: 1em;
-	border-style: outset;
-	border-color: antiquewhite;
-	background: #FF8100;
-}
-
-.mainNav a{
-	color: inherit;
-}
-.mainNav a:hover{
-	text-decoration: underline overline;
-}
-.activeNav {
-	color: #A80101;
-	border-style: inset;
-}
-
-.mainNavElementIcon{
-	display: none;
-}
-
-@media (min-width: 640px){
-	.mainNav{
-		flex-direction: row;
-		justify-content: space-between;
-	}
-	.mainNavElement{
-		flex-basis: 20%;
-		border-radius: 0;
-	}
-}
-@media (min-width: 1280px){
-	.mainNav{
-		margin-top: 1vmin;
-		margin-bottom: 1vmin;
-	}
-}
diff --git a/homepage/redesign2018/css/cwsvJudo-2018-news.css b/homepage/redesign2018/css/cwsvJudo-2018-news.css
deleted file mode 100644
index 4df15bb..0000000
--- a/homepage/redesign2018/css/cwsvJudo-2018-news.css
+++ /dev/null
@@ -1,49 +0,0 @@
-.newsArtikel{
-	width: 100%;
-	background-color: #FFAE00;
-	box-shadow: 0 1px 2px 0 rgba(0,0,0,.5);
-	display: flex;
-	flex-direction: column;
-}
-.newsHeader{
-	display: flex;
-	align-items: stretch;
-	justify-content: space-between;
-	background-color: #FF8100;
-}
-.newsDatum{
-	white-space: nowrap;
-	align-self: center;
-}
-.newsBetreff{
-	margin: auto;
-	margin-left: 1vw;
-	margin-right: 1vw;
-	text-align: end;
-	flex-grow: 1;
-}
-
-.newsPromoImage{
-	float: left;
-}
-
-.newsText{
-	margin: 1vw;
-}
-/*schlechter Hack, der entfernt werden sollte wenn die Kompatibilität mit Datenbank hergestellt ist*/
-.newsText a {
-	float: none;
-	box-shadow: none;
-}
-.newsText img{
-	max-width: 100%;
-	display: block;
-	margin: auto;
-	box-shadow: 0 1px 2px 0 rgba(0,0,0,.5);
-}
-.newsFooter{
-	background-color: #FF8100;
-}
-.newsAutor::before{ 
-    content: "Msg\0000a0";
-}
diff --git a/homepage/redesign2018/css/cwsvJudo-2018-sponsorList.css b/homepage/redesign2018/css/cwsvJudo-2018-sponsorList.css
deleted file mode 100644
index ba31d64..0000000
--- a/homepage/redesign2018/css/cwsvJudo-2018-sponsorList.css
+++ /dev/null
@@ -1,4 +0,0 @@
-.sponsorList ul li img {
-	width: 100%;
-	height: auto;
-}
diff --git a/homepage/redesign2018/css/cwsvJudo-2018-subNav.css b/homepage/redesign2018/css/cwsvJudo-2018-subNav.css
deleted file mode 100644
index d5b33cc..0000000
--- a/homepage/redesign2018/css/cwsvJudo-2018-subNav.css
+++ /dev/null
@@ -1,67 +0,0 @@
-/*
- * Unterauswahl-Navigationsleiste
- */
-
-/* der SubNavContainer*/
-.subNav{
-	display: flex;
-	flex-direction: row;
-	align-items: stretch;
-	justify-content: space-between;
-}
-
-.subNavElement{
-	background: #FF8100;
-	padding-top:.125em;
-	padding-left:.125em;
-	padding-right:.125em;
-	border-radius: 1em;
-	border-style: outset;
-	border-color: antiquewhite;
-	text-decoration: none;
-	flex-basis: 20%;
-	display: flex;
-	justify-content: center;
-	align-items: center;
-	text-align: center;
-}
-
-.subNav a{
-	color: inherit;
-	border-color: antiquewhite;
-}
-
-.subNavElementIcon{
-	text-align: center;
-	max-width: 2.5em;
-	height: auto;
-	padding: .125em;
-}
-
-.subNavElementCaption{
-	display: none;
-}
-
-@media (min-width: 640px){
-	.subNav{
-		flex-direction: column;
-	}
-	.subNavElement{
-		border-radius: 0;
-	}
-	.subNavElementIcon{
-		display: none;
-	}
-	.subNavElementCaption{
-		display: initial;
-		font-family: "Orbitron-Medium", Impact, Charcoal, sans-serif;
-		padding-top: .2em;
-	}
-}
-
-@media (min-width: 1280px){
-	.subNavElement{
-		padding: 1vmin;
-	}
-	.subNav
-}
diff --git a/homepage/redesign2018/css/cwsvJudo-2018-wkKalender.css b/homepage/redesign2018/css/cwsvJudo-2018-wkKalender.css
deleted file mode 100644
index 9bcede5..0000000
--- a/homepage/redesign2018/css/cwsvJudo-2018-wkKalender.css
+++ /dev/null
@@ -1,579 +0,0 @@
-.wkKalender{
-	width: 100%;
-	max-width: 100%;
-	background-color: #FFAE00;
-	margin-bottom: 0;
-}
-
-.wkKalender > thead,
-.wkKalender > tfoot {
-	display: none;
-}
-
-.wkKalender > tbody {
-	display: block;
-}
-
-.wkKalender > tbody > tr:empty,
-.wkKalender > tbody > tr > th:empty{
-	display: none;
-}
-.wkKalender > tbody > tr {
-	display: block;
-	border: 1px solid #e0e0e0;
-	border-radius: 2px;
-	margin-bottom: 1.6rem;
-}
-
-.wkKalender th {
-	display: block;
-	background-color: #666;
-	color: #fff;
-}
-
-.wkKalender > tbody > tr > td {
-	display: block;
-	vertical-align: middle;
-	text-align: right;
-}
-.wkKalender > tbody > tr > td:nth-child(odd) {
-	background-color: #FF8100;
-}
-.wkKalender > tbody > tr > td[data-title]:before {
-	content: attr(data-title);
-	float: left;
-	font-size: inherit;
-	font-weight: 400;
-	color: #757575;
-}
-
-
-@media screen and (min-width: 1280px){
-	.wkKalender > thead{
-		display: table-header-group;
-		width: 100%;
-	}
-	.wkKalender > tbody > tr{
-		display: table-row;
-		width: 100%;
-	}
-	.wkKalender > tbody > tr > td {
-		display: table-cell;
-	}
-	.wkKalender > tbody > tr > td[data-title]:before {
-		display: none;
-		content: "";
-	}
-	.wkKalender > tbody{
-		display: table-row-group;
-	}
-	.wkKalender > tfoot{
-		display: table-footer-group;
-	}
-	.wkKalender > tbody > tr {
-		border: 1px solid #e0e0e0;
-		border-radius: 2px;
-		margin-bottom: 1.6rem;
-	}
-	.wkKalender > tbody > tr > td {
-		vertical-align: middle;
-		text-align: initial;
-	}
-	.wkKalender > tbody > tr:nth-child(odd) {
-		background-color: #FF8100;
-	}
-	.wkKalender > tbody > tr > td:nth-child(odd) {
-		background-color: inherit;
-	}
-	.wkKalender > tbody > tr > td[data-title]:before {
-		content: initial;
-	}
-	.wkKalender tr, th, td {
-		border: 1px solid black;
-	}
-	.wkKalender th {
-		display: table-cell;
-	}
-}
-
-.displayNone{
-	display: none;
-}
-
-.wkInfoBox nav ul li {
-	background-color: #FF8100;
-	display: inline-block;
-	padding: .25em;
-	margin: .25em;
-	box-shadow: 0.1em 0.1em 0.05em grey;
-	border-radius: .5em;
-}
-
-
-/*abgeschaut*/
-.shadow-z-1 {
-	box-shadow: 0 1px 3px 0 rgba(0, 0, 0, 0.12), 0 1px 2px 0 rgba(0, 0, 0, 0.24);
-}
-
-
-/* -- Material Design Table style -------------- */
-/*
-.wkKalender > thead > tr,
-.wkKalender > tbody > tr,
-.wkKalender > tfoot > tr {
-	transition: all 0.3s ease;
-}
-
-.wkKalender > thead > tr > th,
-.wkKalender > tbody > tr > th,
-.wkKalender > tfoot > tr > th,
-.wkKalender > thead > tr > td,
-.wkKalender > tbody > tr > td,
-.wkKalender > tfoot > tr > td {
-	text-align: left;
-	padding: 1.6rem;
-	vertical-align: top;
-	border-top: 0;
-	transition: all 0.3s ease;
-}
-.wkKalender > thead > tr > th {
-	font-weight: 400;
-	color: #757575;
-	vertical-align: bottom;
-	border-bottom: 1px solid rgba(0, 0, 0, 0.12);
-}
-.wkKalender > caption + thead   > tr:first-child > th,
-.wkKalender > colgroup + thead  > tr:first-child > th,
-.wkKalender > thead:first-child > tr:first-child > th,
-.wkKalender > caption + thead   > tr:first-child > td,
-.wkKalender > colgroup + thead  > tr:first-child > td,
-.wkKalender > thead:first-child > tr:first-child > td {
-	border-top: 0;
-}
-.wkKalender > tbody + tbody {
-	border-top: 1px solid rgba(0, 0, 0, 0.12);
-}
-.wkKalender .table {
-	background-color: #fff;
-}
-.wkKalender .no-border {
-	border: 0;
-}
-@media screen and (max-width: 640px){
-  .table-responsive-vertical.shadow-z-1 > .table > tbody > tr {
-    border: none;
-    -webkit-box-shadow: 0 1px 3px 0 rgba(0, 0, 0, 0.12), 0 1px 2px 0 rgba(0, 0, 0, 0.24);
-    -moz-box-shadow: 0 1px 3px 0 rgba(0, 0, 0, 0.12), 0 1px 2px 0 rgba(0, 0, 0, 0.24);
-    box-shadow: 0 1px 3px 0 rgba(0, 0, 0, 0.12), 0 1px 2px 0 rgba(0, 0, 0, 0.24);
-  }
-  .wkKalender-bordered {
-    border: 0;
-  }
-  .wkKalender-bordered > tbody > tr > td {
-    border: 0;
-    border-bottom: 1px solid #e0e0e0;
-  }
-  .wkKalender-bordered > tbody > tr > td:last-child {
-    border-bottom: 0;
-  }
-  .wkKalender-striped > tbody > tr > td,
-  .wkKalender-striped > tbody > tr:nth-child(odd) {
-    background-color: #fff;
-  }
-  .wkKalender-striped > tbody > tr > td:nth-child(odd) {
-    background-color: #f5f5f5;
-  }
-  .wkKalender-hover > tbody > tr:hover > td,
-  .wkKalender-hover > tbody > tr:hover {
-    background-color: #fff;
-  }
-  .wkKalender-hover > tbody > tr > td:hover {
-    background-color: rgba(0, 0, 0, 0.12);
-  }
-}
-
-.wkKalender-striped.table-mc-red > tbody > tr:nth-child(odd) > td,
-.wkKalender-striped.table-mc-red > tbody > tr:nth-child(odd) > th {
-  background-color: #fde0dc;
-}
-.wkKalender-hover.table-mc-red > tbody > tr:hover > td,
-.wkKalender-hover.table-mc-red > tbody > tr:hover > th {
-  background-color: #f9bdbb;
-}
-@media screen and (max-width: 767px) {
-  .table-responsive-vertical .table-striped.table-mc-red > tbody > tr > td,
-  .table-responsive-vertical .table-striped.table-mc-red > tbody > tr:nth-child(odd) {
-    background-color: #fff;
-  }
-  .table-responsive-vertical .table-striped.table-mc-red > tbody > tr > td:nth-child(odd) {
-    background-color: #fde0dc;
-  }
-  .table-responsive-vertical .table-hover.table-mc-red > tbody > tr:hover > td,
-  .table-responsive-vertical .table-hover.table-mc-red > tbody > tr:hover {
-    background-color: #fff;
-  }
-  .table-responsive-vertical .table-hover.table-mc-red > tbody > tr > td:hover {
-    background-color: #f9bdbb;
-  }
-}
-.wkKalender-striped.table-mc-pink > tbody > tr:nth-child(odd) > td,
-.wkKalender-striped.table-mc-pink > tbody > tr:nth-child(odd) > th {
-  background-color: #fce4ec;
-}
-.wkKalender-hover.table-mc-pink > tbody > tr:hover > td,
-.wkKalender-hover.table-mc-pink > tbody > tr:hover > th {
-  background-color: #f8bbd0;
-}
-@media screen and (max-width: 767px) {
-  .table-responsive-vertical .table-striped.table-mc-pink > tbody > tr > td,
-  .table-responsive-vertical .table-striped.table-mc-pink > tbody > tr:nth-child(odd) {
-    background-color: #fff;
-  }
-  .table-responsive-vertical .table-striped.table-mc-pink > tbody > tr > td:nth-child(odd) {
-    background-color: #fce4ec;
-  }
-  .table-responsive-vertical .table-hover.table-mc-pink > tbody > tr:hover > td,
-  .table-responsive-vertical .table-hover.table-mc-pink > tbody > tr:hover {
-    background-color: #fff;
-  }
-  .table-responsive-vertical .table-hover.table-mc-pink > tbody > tr > td:hover {
-    background-color: #f8bbd0;
-  }
-}
-.wkKalender-striped.table-mc-purple > tbody > tr:nth-child(odd) > td,
-.wkKalender-striped.table-mc-purple > tbody > tr:nth-child(odd) > th {
-  background-color: #f3e5f5;
-}
-.wkKalender-hover.table-mc-purple > tbody > tr:hover > td,
-.wkKalender-hover.table-mc-purple > tbody > tr:hover > th {
-  background-color: #e1bee7;
-}
-@media screen and (max-width: 767px) {
-  .table-responsive-vertical .table-striped.table-mc-purple > tbody > tr > td,
-  .table-responsive-vertical .table-striped.table-mc-purple > tbody > tr:nth-child(odd) {
-    background-color: #fff;
-  }
-  .table-responsive-vertical .table-striped.table-mc-purple > tbody > tr > td:nth-child(odd) {
-    background-color: #f3e5f5;
-  }
-  .table-responsive-vertical .table-hover.table-mc-purple > tbody > tr:hover > td,
-  .table-responsive-vertical .table-hover.table-mc-purple > tbody > tr:hover {
-    background-color: #fff;
-  }
-  .table-responsive-vertical .table-hover.table-mc-purple > tbody > tr > td:hover {
-    background-color: #e1bee7;
-  }
-}
-.wkKalender-striped.table-mc-deep-purple > tbody > tr:nth-child(odd) > td,
-.wkKalender-striped.table-mc-deep-purple > tbody > tr:nth-child(odd) > th {
-  background-color: #ede7f6;
-}
-.wkKalender-hover.table-mc-deep-purple > tbody > tr:hover > td,
-.wkKalender-hover.table-mc-deep-purple > tbody > tr:hover > th {
-  background-color: #d1c4e9;
-}
-@media screen and (max-width: 767px) {
-  .table-responsive-vertical .table-striped.table-mc-deep-purple > tbody > tr > td,
-  .table-responsive-vertical .table-striped.table-mc-deep-purple > tbody > tr:nth-child(odd) {
-    background-color: #fff;
-  }
-  .table-responsive-vertical .table-striped.table-mc-deep-purple > tbody > tr > td:nth-child(odd) {
-    background-color: #ede7f6;
-  }
-  .table-responsive-vertical .table-hover.table-mc-deep-purple > tbody > tr:hover > td,
-  .table-responsive-vertical .table-hover.table-mc-deep-purple > tbody > tr:hover {
-    background-color: #fff;
-  }
-  .table-responsive-vertical .table-hover.table-mc-deep-purple > tbody > tr > td:hover {
-    background-color: #d1c4e9;
-  }
-}
-.wkKalender-striped.table-mc-indigo > tbody > tr:nth-child(odd) > td,
-.wkKalender-striped.table-mc-indigo > tbody > tr:nth-child(odd) > th {
-  background-color: #e8eaf6;
-}
-.wkKalender-hover.table-mc-indigo > tbody > tr:hover > td,
-.wkKalender-hover.table-mc-indigo > tbody > tr:hover > th {
-  background-color: #c5cae9;
-}
-@media screen and (max-width: 767px) {
-  .table-responsive-vertical .table-striped.table-mc-indigo > tbody > tr > td,
-  .table-responsive-vertical .table-striped.table-mc-indigo > tbody > tr:nth-child(odd) {
-    background-color: #fff;
-  }
-  .table-responsive-vertical .table-striped.table-mc-indigo > tbody > tr > td:nth-child(odd) {
-    background-color: #e8eaf6;
-  }
-  .table-responsive-vertical .table-hover.table-mc-indigo > tbody > tr:hover > td,
-  .table-responsive-vertical .table-hover.table-mc-indigo > tbody > tr:hover {
-    background-color: #fff;
-  }
-  .table-responsive-vertical .table-hover.table-mc-indigo > tbody > tr > td:hover {
-    background-color: #c5cae9;
-  }
-}
-.wkKalender-striped.table-mc-blue > tbody > tr:nth-child(odd) > td,
-.wkKalender-striped.table-mc-blue > tbody > tr:nth-child(odd) > th {
-  background-color: #e7e9fd;
-}
-.wkKalender-hover.table-mc-blue > tbody > tr:hover > td,
-.wkKalender-hover.table-mc-blue > tbody > tr:hover > th {
-  background-color: #d0d9ff;
-}
-@media screen and (max-width: 767px) {
-  .table-responsive-vertical .table-striped.table-mc-blue > tbody > tr > td,
-  .table-responsive-vertical .table-striped.table-mc-blue > tbody > tr:nth-child(odd) {
-    background-color: #fff;
-  }
-  .table-responsive-vertical .table-striped.table-mc-blue > tbody > tr > td:nth-child(odd) {
-    background-color: #e7e9fd;
-  }
-  .table-responsive-vertical .table-hover.table-mc-blue > tbody > tr:hover > td,
-  .table-responsive-vertical .table-hover.table-mc-blue > tbody > tr:hover {
-    background-color: #fff;
-  }
-  .table-responsive-vertical .table-hover.table-mc-blue > tbody > tr > td:hover {
-    background-color: #d0d9ff;
-  }
-}
-.wkKalender-striped.table-mc-light-blue > tbody > tr:nth-child(odd) > td,
-.wkKalender-striped.table-mc-light-blue > tbody > tr:nth-child(odd) > th {
-  background-color: #e1f5fe;
-}
-.wkKalender-hover.table-mc-light-blue > tbody > tr:hover > td,
-.wkKalender-hover.table-mc-light-blue > tbody > tr:hover > th {
-  background-color: #b3e5fc;
-}
-@media screen and (max-width: 767px) {
-  .table-responsive-vertical .table-striped.table-mc-light-blue > tbody > tr > td,
-  .table-responsive-vertical .table-striped.table-mc-light-blue > tbody > tr:nth-child(odd) {
-    background-color: #fff;
-  }
-  .table-responsive-vertical .table-striped.table-mc-light-blue > tbody > tr > td:nth-child(odd) {
-    background-color: #e1f5fe;
-  }
-  .table-responsive-vertical .table-hover.table-mc-light-blue > tbody > tr:hover > td,
-  .table-responsive-vertical .table-hover.table-mc-light-blue > tbody > tr:hover {
-    background-color: #fff;
-  }
-  .table-responsive-vertical .table-hover.table-mc-light-blue > tbody > tr > td:hover {
-    background-color: #b3e5fc;
-  }
-}
-.wkKalender-striped.table-mc-cyan > tbody > tr:nth-child(odd) > td,
-.wkKalender-striped.table-mc-cyan > tbody > tr:nth-child(odd) > th {
-  background-color: #e0f7fa;
-}
-.wkKalender-hover.table-mc-cyan > tbody > tr:hover > td,
-.wkKalender-hover.table-mc-cyan > tbody > tr:hover > th {
-  background-color: #b2ebf2;
-}
-@media screen and (max-width: 767px) {
-  .table-responsive-vertical .table-striped.table-mc-cyan > tbody > tr > td,
-  .table-responsive-vertical .table-striped.table-mc-cyan > tbody > tr:nth-child(odd) {
-    background-color: #fff;
-  }
-  .table-responsive-vertical .table-striped.table-mc-cyan > tbody > tr > td:nth-child(odd) {
-    background-color: #e0f7fa;
-  }
-  .table-responsive-vertical .table-hover.table-mc-cyan > tbody > tr:hover > td,
-  .table-responsive-vertical .table-hover.table-mc-cyan > tbody > tr:hover {
-    background-color: #fff;
-  }
-  .table-responsive-vertical .table-hover.table-mc-cyan > tbody > tr > td:hover {
-    background-color: #b2ebf2;
-  }
-}
-.wkKalender-striped.table-mc-teal > tbody > tr:nth-child(odd) > td,
-.wkKalender-striped.table-mc-teal > tbody > tr:nth-child(odd) > th {
-  background-color: #e0f2f1;
-}
-.wkKalender-hover.table-mc-teal > tbody > tr:hover > td,
-.wkKalender-hover.table-mc-teal > tbody > tr:hover > th {
-  background-color: #b2dfdb;
-}
-@media screen and (max-width: 767px) {
-  .table-responsive-vertical .table-striped.table-mc-teal > tbody > tr > td,
-  .table-responsive-vertical .table-striped.table-mc-teal > tbody > tr:nth-child(odd) {
-    background-color: #fff;
-  }
-  .table-responsive-vertical .table-striped.table-mc-teal > tbody > tr > td:nth-child(odd) {
-    background-color: #e0f2f1;
-  }
-  .table-responsive-vertical .table-hover.table-mc-teal > tbody > tr:hover > td,
-  .table-responsive-vertical .table-hover.table-mc-teal > tbody > tr:hover {
-    background-color: #fff;
-  }
-  .table-responsive-vertical .table-hover.table-mc-teal > tbody > tr > td:hover {
-    background-color: #b2dfdb;
-  }
-}
-.wkKalender-striped.table-mc-green > tbody > tr:nth-child(odd) > td,
-.wkKalender-striped.table-mc-green > tbody > tr:nth-child(odd) > th {
-  background-color: #d0f8ce;
-}
-.wkKalender-hover.table-mc-green > tbody > tr:hover > td,
-.wkKalender-hover.table-mc-green > tbody > tr:hover > th {
-  background-color: #a3e9a4;
-}
-@media screen and (max-width: 767px) {
-  .table-responsive-vertical .table-striped.table-mc-green > tbody > tr > td,
-  .table-responsive-vertical .table-striped.table-mc-green > tbody > tr:nth-child(odd) {
-    background-color: #fff;
-  }
-  .table-responsive-vertical .table-striped.table-mc-green > tbody > tr > td:nth-child(odd) {
-    background-color: #d0f8ce;
-  }
-  .table-responsive-vertical .table-hover.table-mc-green > tbody > tr:hover > td,
-  .table-responsive-vertical .table-hover.table-mc-green > tbody > tr:hover {
-    background-color: #fff;
-  }
-  .table-responsive-vertical .table-hover.table-mc-green > tbody > tr > td:hover {
-    background-color: #a3e9a4;
-  }
-}
-.wkKalender-striped.table-mc-light-green > tbody > tr:nth-child(odd) > td,
-.wkKalender-striped.table-mc-light-green > tbody > tr:nth-child(odd) > th {
-  background-color: #f1f8e9;
-}
-.wkKalender-hover.table-mc-light-green > tbody > tr:hover > td,
-.wkKalender-hover.table-mc-light-green > tbody > tr:hover > th {
-  background-color: #dcedc8;
-}
-@media screen and (max-width: 767px) {
-  .table-responsive-vertical .table-striped.table-mc-light-green > tbody > tr > td,
-  .table-responsive-vertical .table-striped.table-mc-light-green > tbody > tr:nth-child(odd) {
-    background-color: #fff;
-  }
-  .table-responsive-vertical .table-striped.table-mc-light-green > tbody > tr > td:nth-child(odd) {
-    background-color: #f1f8e9;
-  }
-  .table-responsive-vertical .table-hover.table-mc-light-green > tbody > tr:hover > td,
-  .table-responsive-vertical .table-hover.table-mc-light-green > tbody > tr:hover {
-    background-color: #fff;
-  }
-  .table-responsive-vertical .table-hover.table-mc-light-green > tbody > tr > td:hover {
-    background-color: #dcedc8;
-  }
-}
-.wkKalender-striped.table-mc-lime > tbody > tr:nth-child(odd) > td,
-.wkKalender-striped.table-mc-lime > tbody > tr:nth-child(odd) > th {
-  background-color: #f9fbe7;
-}
-.wkKalender-hover.table-mc-lime > tbody > tr:hover > td,
-.wkKalender-hover.table-mc-lime > tbody > tr:hover > th {
-  background-color: #f0f4c3;
-}
-@media screen and (max-width: 767px) {
-  .table-responsive-vertical .table-striped.table-mc-lime > tbody > tr > td,
-  .table-responsive-vertical .table-striped.table-mc-lime > tbody > tr:nth-child(odd) {
-    background-color: #fff;
-  }
-  .table-responsive-vertical .table-striped.table-mc-lime > tbody > tr > td:nth-child(odd) {
-    background-color: #f9fbe7;
-  }
-  .table-responsive-vertical .table-hover.table-mc-lime > tbody > tr:hover > td,
-  .table-responsive-vertical .table-hover.table-mc-lime > tbody > tr:hover {
-    background-color: #fff;
-  }
-  .table-responsive-vertical .table-hover.table-mc-lime > tbody > tr > td:hover {
-    background-color: #f0f4c3;
-  }
-}
-.wkKalender-striped.table-mc-yellow > tbody > tr:nth-child(odd) > td,
-.wkKalender-striped.table-mc-yellow > tbody > tr:nth-child(odd) > th {
-  background-color: #fffde7;
-}
-.wkKalender-hover.table-mc-yellow > tbody > tr:hover > td,
-.wkKalender-hover.table-mc-yellow > tbody > tr:hover > th {
-  background-color: #fff9c4;
-}
-@media screen and (max-width: 767px) {
-  .table-responsive-vertical .table-striped.table-mc-yellow > tbody > tr > td,
-  .table-responsive-vertical .table-striped.table-mc-yellow > tbody > tr:nth-child(odd) {
-    background-color: #fff;
-  }
-  .table-responsive-vertical .table-striped.table-mc-yellow > tbody > tr > td:nth-child(odd) {
-    background-color: #fffde7;
-  }
-  .table-responsive-vertical .table-hover.table-mc-yellow > tbody > tr:hover > td,
-  .table-responsive-vertical .table-hover.table-mc-yellow > tbody > tr:hover {
-    background-color: #fff;
-  }
-  .table-responsive-vertical .table-hover.table-mc-yellow > tbody > tr > td:hover {
-    background-color: #fff9c4;
-  }
-}
-.wkKalender-striped.table-mc-amber > tbody > tr:nth-child(odd) > td,
-.wkKalender-striped.table-mc-amber > tbody > tr:nth-child(odd) > th {
-  background-color: #fff8e1;
-}
-.wkKalender-hover.table-mc-amber > tbody > tr:hover > td,
-.wkKalender-hover.table-mc-amber > tbody > tr:hover > th {
-  background-color: #ffecb3;
-}
-@media screen and (max-width: 767px) {
-  .table-responsive-vertical .table-striped.table-mc-amber > tbody > tr > td,
-  .table-responsive-vertical .table-striped.table-mc-amber > tbody > tr:nth-child(odd) {
-    background-color: #fff;
-  }
-  .table-responsive-vertical .table-striped.table-mc-amber > tbody > tr > td:nth-child(odd) {
-    background-color: #fff8e1;
-  }
-  .table-responsive-vertical .table-hover.table-mc-amber > tbody > tr:hover > td,
-  .table-responsive-vertical .table-hover.table-mc-amber > tbody > tr:hover {
-    background-color: #fff;
-  }
-  .table-responsive-vertical .table-hover.table-mc-amber > tbody > tr > td:hover {
-    background-color: #ffecb3;
-  }
-}
-.wkKalender-striped.table-mc-orange > tbody > tr:nth-child(odd) > td,
-.wkKalender-striped.table-mc-orange > tbody > tr:nth-child(odd) > th {
-  background-color: #fff3e0;
-}
-.wkKalender-hover.table-mc-orange > tbody > tr:hover > td,
-.wkKalender-hover.table-mc-orange > tbody > tr:hover > th {
-  background-color: #ffe0b2;
-}
-@media screen and (max-width: 767px) {
-  .table-responsive-vertical .table-striped.table-mc-orange > tbody > tr > td,
-  .table-responsive-vertical .table-striped.table-mc-orange > tbody > tr:nth-child(odd) {
-    background-color: #fff;
-  }
-  .table-responsive-vertical .table-striped.table-mc-orange > tbody > tr > td:nth-child(odd) {
-    background-color: #fff3e0;
-  }
-  .table-responsive-vertical .table-hover.table-mc-orange > tbody > tr:hover > td,
-  .table-responsive-vertical .table-hover.table-mc-orange > tbody > tr:hover {
-    background-color: #fff;
-  }
-  .table-responsive-vertical .table-hover.table-mc-orange > tbody > tr > td:hover {
-    background-color: #ffe0b2;
-  }
-}
-.wkKalender-striped.table-mc-deep-orange > tbody > tr:nth-child(odd) > td,
-.wkKalender-striped.table-mc-deep-orange > tbody > tr:nth-child(odd) > th {
-  background-color: #fbe9e7;
-}
-.wkKalender-hover.table-mc-deep-orange > tbody > tr:hover > td,
-.wkKalender-hover.table-mc-deep-orange > tbody > tr:hover > th {
-  background-color: #ffccbc;
-}
-@media screen and (max-width: 767px) {
-  .table-responsive-vertical .table-striped.table-mc-deep-orange > tbody > tr > td,
-  .table-responsive-vertical .table-striped.table-mc-deep-orange > tbody > tr:nth-child(odd) {
-    background-color: #fff;
-  }
-  .table-responsive-vertical .table-striped.table-mc-deep-orange > tbody > tr > td:nth-child(odd) {
-    background-color: #fbe9e7;
-  }
-  .table-responsive-vertical .table-hover.table-mc-deep-orange > tbody > tr:hover > td,
-  .table-responsive-vertical .table-hover.table-mc-deep-orange > tbody > tr:hover {
-    background-color: #fff;
-  }
-  .table-responsive-vertical .table-hover.table-mc-deep-orange > tbody > tr > td:hover {
-    background-color: #ffccbc;
-  }
-}
-*/
diff --git a/homepage/redesign2018/css/cwsvJudo-2018.css b/homepage/redesign2018/css/cwsvJudo-2018.css
deleted file mode 100644
index 6c1c1dd..0000000
--- a/homepage/redesign2018/css/cwsvJudo-2018.css
+++ /dev/null
@@ -1,165 +0,0 @@
-/*
- * Schriftarten
- */
-@font-face {
-	font-family: Orbitron-Medium;
-	src: url(/ressourcen/fonts/Orbitron-Medium.otf);
-}
-
-/**
- * Schriftgrößen
- */
-body{
-	font-size: 4vw;
-}
-@media (min-width: 640px){
-	body{
-		font-size: 2vw;
-	}
-}
-@media (min-width: 1280px){
-	body{
-		font-size: 1.3vw;
-	}
-}
-
-/*
- * Ein Reset für das BoxSizing
- * Wir wollen Maße auf die "äußere Boundingbox" beziehen
- */
-
-html{
-	box-sizing: border-box;
-}
-*, ::before, ::after {
-	box-sizing: inherit;
-}
-
-/*
- * Body
- */
-body{
-	background: #FFAE00;
-	font-family: arial, helvetica, sans-serif;
-}
-
-
-/* Container für eine einzelne News */
-.newsBox{
-	border: solid 1px #000000;
-	padding: 1vmin;
-	margin: 1vmin;
-	display: flex;
-	flex-direction:column;
-}
-.newsBoxHeader{
-	background: #FF8100;
-	display: flex;
-	flex-direction: column;
-}
-.newsBoxFooter{
-	clear: both;
-	background: #FF8100;
-}
-
-
-/*
- * Sidenotes und ihre Kinder
- */
-
-.expCounter{
-	display: none;
-	margin-top: 5%;
-	margin-bottom: 5%;
-}
-
-
-/*
- * Wettkampfkalender
-*/
-
-/*
-.wkKalender th {
-	background-color: #666; 
-	color: #fff;
-}
-.wkKalenderMonth {
-	background-color: #666; 
-	color: #fff;
-	
-}
-.wkKalender tr {
-	background-color: #FFAE00;
-	color: #000;
-}
-.wkKalender tr:nth-child(odd) {
-	background-color: #FF8100 ;
-}
-*/
-
-/*
- * Allgemeine Formatierungen als class
- */
-
-.larger{
-	font-size: larger;
-}
-.bold{
-	font-weight: bold;
-}
-.floatLeft{
-	float: left;
-}
-.fullWidth{
-	width:100%;
-}
-
-.valignMiddle{
-	vertical-align:middle;
-}
-
-/* Bilder in voller Breite */
-.bigPicture{
-	width: 100%;
-	height: auto;
-}
-
-/* Orbitronschrift inkl. top-padding-Korrektur */
-.orbitronMediumFont{
-	font-family: "Orbitron-Medium", Impact, Charcoal, sans-serif;
-	padding-top: .2em;/* wg. Orbitron */
-}
-
-/* touchable Links*/
-.touchLink{
-	display: inline-block;
-	padding: 0.25em 0 0.25em 0;
-	margin: 0.25em 0 0.25em 0;
-	background-color: #FF8100;
-	border-radius: .5em;
-}
-
-.hyphenate{
-	hyphens: auto;
-}
-
-.pngAddress{
-	width: 17em;
-	height: auto;
-	vertical-align: middle;
-}
-
-.charImg{
-	height: 1em;
-	display: inline;
-	vertical-align: middle;
-}
-
-.noWrap{
-	white-space:nowrap;
-}
-
-.floatClearBoth{
-	clear: both;
-}
-
diff --git a/homepage/redesign2018/cwsv-judo-logo.png b/homepage/redesign2018/cwsv-judo-logo.png
deleted file mode 100644
index c49fb12..0000000
Binary files a/homepage/redesign2018/cwsv-judo-logo.png and /dev/null differ
diff --git a/homepage/redesign2018/cwsvJudoLogoWappen.x256.png b/homepage/redesign2018/cwsvJudoLogoWappen.x256.png
deleted file mode 100644
index 495f55c..0000000
Binary files a/homepage/redesign2018/cwsvJudoLogoWappen.x256.png and /dev/null differ
diff --git a/homepage/redesign2018/cwsvLogoWappen.x250.png b/homepage/redesign2018/cwsvLogoWappen.x250.png
deleted file mode 100644
index f83b713..0000000
Binary files a/homepage/redesign2018/cwsvLogoWappen.x250.png and /dev/null differ
diff --git a/homepage/redesign2018/graphiken/icons/HTML5_1Color_Black.svg b/homepage/redesign2018/graphiken/icons/HTML5_1Color_Black.svg
deleted file mode 100644
index 0a53b0b..0000000
--- a/homepage/redesign2018/graphiken/icons/HTML5_1Color_Black.svg
+++ /dev/null
@@ -1,26 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!DOCTYPE svg PUBLIC "-//W3C//DTD SVG 1.1//EN" "http://www.w3.org/Graphics/SVG/1.1/DTD/svg11.dtd">
-<svg version="1.1" id="Layer_1" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" x="0px" y="0px"
-	 width="512px" height="512px" viewBox="0 0 512 512" enable-background="new 0 0 512 512" xml:space="preserve">
-<g>
-	<g>
-		<path fill="#231F20" d="M119.387,20.312h21.298v21.045h19.485V20.312h21.303v63.727H160.17V62.7h-19.485v21.338h-21.298V20.312z"
-			/>
-		<path fill="#231F20" d="M209.482,41.444h-18.754V20.312h58.812v21.133h-18.759v42.594h-21.3V41.444z"/>
-		<path fill="#231F20" d="M258.879,20.312h22.21l13.661,22.392l13.648-22.392h22.219v63.727h-21.212V52.453L294.75,75.111h-0.366
-			l-14.665-22.658v31.585h-20.84V20.312z"/>
-		<path fill="#231F20" d="M341.219,20.312h21.308v42.664h29.955v21.062h-51.263V20.312z"/>
-	</g>
-	<path fill="#231F20" d="M200.662,266.676H256v-42.92h-59.169L200.662,266.676z M88.686,111.982l30.47,341.74l136.762,37.966
-		l136.891-37.948l30.507-341.758H88.686z M366.694,431.981L256,462.668v-43.494l-0.067,0.02l-85.858-23.835l-6.004-67.298h42.075
-		l3.116,34.914l46.68,12.607l0.059-0.019V308.59h-93.669l-11.306-126.749H256v-41.914h136.766L366.694,431.981z"/>
-	<path opacity="0.8" fill="#231F20" d="M307.592,308.59H256v66.974l46.728-12.613L307.592,308.59z M256,139.927v41.914h104.975
-		l-3.754,41.915H256v42.92h97.406l-11.499,128.683L256,419.174v43.494l110.694-30.687l26.071-292.055H256z"/>
-	<g opacity="0.2">
-		<polygon fill="#231F20" points="256,181.841 151.025,181.841 162.331,308.59 256,308.59 256,266.676 200.662,266.676 
-			196.831,223.756 256,223.756 		"/>
-		<polygon fill="#231F20" points="256,375.563 255.941,375.582 209.262,362.975 206.146,328.061 164.07,328.061 170.074,395.358 
-			255.933,419.193 256,419.174 		"/>
-	</g>
-</g>
-</svg>
diff --git a/homepage/redesign2018/graphiken/icons/arrowRightDown.svg b/homepage/redesign2018/graphiken/icons/arrowRightDown.svg
deleted file mode 100644
index 9711c12..0000000
--- a/homepage/redesign2018/graphiken/icons/arrowRightDown.svg
+++ /dev/null
@@ -1,4 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<svg viewBox="0 0 500 500" xmlns="http://www.w3.org/2000/svg">
- <path transform="matrix(6.123e-17 1 -1 6.123e-17 524.06 -15.226)" d="m53.704 164.35 371.45 1.119 54.824 104.05-54.824 108.53-372.57-2.237 54.824-106.29-53.705-105.17z" fill-rule="evenodd" stroke="#000" stroke-width="1.25"/>
-</svg>
diff --git a/homepage/redesign2018/graphiken/icons/star.svg b/homepage/redesign2018/graphiken/icons/star.svg
deleted file mode 100644
index 54adf91..0000000
--- a/homepage/redesign2018/graphiken/icons/star.svg
+++ /dev/null
@@ -1,13 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<svg viewBox="0 0 24 24" xmlns="http://www.w3.org/2000/svg">
- <defs>
-  <linearGradient id="a" x1="2.1296" x2="12.138" y1="1048.2" y2="1042.2" gradientUnits="userSpaceOnUse" spreadMethod="reflect">
-   <stop stop-color="#555" offset="0"/>
-   <stop stop-color="#555" offset=".45869"/>
-   <stop stop-color="#bfbfbf" offset="1"/>
-  </linearGradient>
- </defs>
- <g transform="translate(0 -1028.4)">
-  <path d="m18.143 1049.2-5.929-3.003-5.8352 3.1817 1.0239-6.5669-4.8292-4.5664 6.5619-1.0554 2.8506-6.0039 3.0315 5.9145 6.5909 0.8558-4.6883 4.7109z" fill="none" stroke="url(#a)" stroke-width="1.201"/>
- </g>
-</svg>
diff --git a/homepage/redesign2018/html.pandocTemplate b/homepage/redesign2018/html.pandocTemplate
deleted file mode 100644
index b9a84b5..0000000
--- a/homepage/redesign2018/html.pandocTemplate
+++ /dev/null
@@ -1,64 +0,0 @@
-<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
-<html xmlns="http://www.w3.org/1999/xhtml"$if(lang)$ lang="$lang$" xml:lang="$lang$"$endif$$if(dir)$ dir="$dir$"$endif$>
-<head>
-  <meta http-equiv="Content-Type" content="text/html; charset=utf-8" />
-  <meta http-equiv="Content-Style-Type" content="text/css" />
-  <meta name="generator" content="pandoc" />
-$for(author-meta)$
-  <meta name="author" content="$author-meta$" />
-$endfor$
-$if(date-meta)$
-  <meta name="date" content="$date-meta$" />
-$endif$
-$if(keywords)$
-  <meta name="keywords" content="$for(keywords)$$keywords$$sep$, $endfor$" />
-$endif$
-  <title>$if(title-prefix)$$title-prefix$ – $endif$$pagetitle$</title>
-  <style type="text/css">code{white-space: pre;}</style>
-$if(quotes)$
-  <style type="text/css">q { quotes: "“" "”" "‘" "’"; }</style>
-$endif$
-$if(highlighting-css)$
-  <style type="text/css">
-$highlighting-css$
-  </style>
-$endif$
-$for(css)$
-  <link rel="stylesheet" href="$css$" type="text/css" />
-$endfor$
-$if(math)$
-  $math$
-$endif$
-$for(header-includes)$
-  $header-includes$
-$endfor$
-</head>
-<body>
-$for(include-before)$
-$include-before$
-$endfor$
-$if(title)$
-<div id="$idprefix$header">
-<h1 class="title">$title$</h1>
-$if(subtitle)$
-<h1 class="subtitle">$subtitle$</h1>
-$endif$
-$for(author)$
-<h2 class="author">$author$</h2>
-$endfor$
-$if(date)$
-<h3 class="date">$date$</h3>
-$endif$
-</div>
-$endif$
-$if(toc)$
-<div id="$idprefix$TOC">
-$toc$
-</div>
-$endif$
-$body$
-$for(include-after)$
-$include-after$
-$endfor$
-</body>
-</html>
diff --git a/homepage/redesign2018/html5.pandocTemplate b/homepage/redesign2018/html5.pandocTemplate
deleted file mode 100644
index 7dcde39..0000000
--- a/homepage/redesign2018/html5.pandocTemplate
+++ /dev/null
@@ -1,68 +0,0 @@
-<!DOCTYPE html>
-<html$if(lang)$ lang="$lang$"$endif$$if(dir)$ dir="$dir$"$endif$>
-<head>
-	<?php echo("Hallo!\n");?>
-  <meta charset="utf-8">
-  <meta name="generator" content="pandoc">
-  <meta name="viewport" content="width=device-width, initial-scale=1.0, user-scalable=yes">
-$for(author-meta)$
-  <meta name="author" content="$author-meta$">
-$endfor$
-$if(date-meta)$
-  <meta name="dcterms.date" content="$date-meta$">
-$endif$
-$if(keywords)$
-  <meta name="keywords" content="$for(keywords)$$keywords$$sep$, $endfor$">
-$endif$
-  <title>$if(title-prefix)$$title-prefix$ – $endif$$pagetitle$</title>
-  <style type="text/css">code{white-space: pre;}</style>
-$if(quotes)$
-  <style type="text/css">q { quotes: "“" "”" "‘" "’"; }</style>
-$endif$
-$if(highlighting-css)$
-  <style type="text/css">
-$highlighting-css$
-  </style>
-$endif$
-$for(css)$
-  <link rel="stylesheet" href="$css$">
-$endfor$
-$if(math)$
-  $math$
-$endif$
-  <!--[if lt IE 9]>
-    <script src="//cdnjs.cloudflare.com/ajax/libs/html5shiv/3.7.3/html5shiv-printshiv.min.js"></script>
-  <![endif]-->
-$for(header-includes)$
-  $header-includes$
-$endfor$
-</head>
-<body>
-$for(include-before)$
-$include-before$
-$endfor$
-$if(title)$
-<header>
-<h1 class="title">$title$</h1>
-$if(subtitle)$
-<p class="subtitle">$subtitle$</p>
-$endif$
-$for(author)$
-<p class="author">$author$</p>
-$endfor$
-$if(date)$
-<p class="date">$date$</p>
-$endif$
-</header>
-$endif$
-$if(toc)$
-<nav id="$idprefix$TOC">
-$toc$
-</nav>
-$endif$
-$body$
-$for(include-after)$
-$include-after$
-$endfor$
-</body>
-</html>
diff --git a/homepage/redesign2018/json/cwsvJudo-Links.json b/homepage/redesign2018/json/cwsvJudo-Links.json
deleted file mode 100644
index 18c8ee7..0000000
--- a/homepage/redesign2018/json/cwsvJudo-Links.json
+++ /dev/null
@@ -1,55 +0,0 @@
-{
-	"home":{
-		"caption" : "Home",
-		"icon" : "/ressourcen/graphiken/logos/cwsvJudoLogoWappen.x256.png",
-		"title" : "Homepage der Abteilung Judo des Chemnitzer Freizeit- und Wohngebietsportvereines",
-		"href" : "index.php"
-	},
-	"trainingszeiten":{
-		"caption" : "Trainings&shy;zeiten",
-		"icon" : "/ressourcen/graphiken/icons/clockIconFriendly.svg",
-		"title" : "Trainingszeiten und -orte der Judoka des Chemnitzer WSV",
-		"href" : "trainingszeiten.php"
-	},
-	"wettkampfkalender":{
-		"caption" : "Termine",
-		"icon" : "/ressourcen/graphiken/icons/calendarIcon.svg",
-		"title" : "Kalender mit Terminen für Wettkämpfe",
-		"href" : "kalender.php"
-	},
-	"kontakt":{
-		"caption" : "Kontakt",
-		"icon" : "/ressourcen/graphiken/icons/contact4Ways.svg",
-		"title" : "Möglichkeiten mit dem Chemnitzer Freizeit- und Wohngebietssportverein in Kontakt zu treten",
-		"href" : "kontakt.php"
-	},
-	"gallerien":{
-		"caption" : "Gallerien",
-		"icon" : "/ressourcen/graphiken/icons/gallery.svg",
-		"title" : "Bilder und Videos von unseren Wettkämpfen und sonstigen Veranstaltungen",
-		"href" : "verein.galerien.php"
-	},
-	"judowiki":{
-		"caption" : "JudoWiki",
-		"icon" : "/ressourcen/graphiken/icons/wikipediaW.svg",
-		"title" : "Ein kleines Nachschlagewerk über Judo",
-		"href" : "/JudoWiki"
-	},
-	"news":{
-		"caption" : "News",
-		"icon" : "/ressourcen/graphiken/icons/newsIcon.svg",
-		"title" : "Bekanntmachungen der Abteilung Judo des Chemnitzer Freizeit- und Wohngebietsportvereines",
-		"href" : "news.php"
-	},
-	"verein":{
-		"caption" : "Verein",
-		"icon" : "/ressourcen/graphiken/logos/cwsvLogoWappen.x250.png",
-		"title" : "Informationen über den Chemnitzer Freizeit- und Wohngebietssportverein und dessen Sektion Judo",
-		"href" : "verein.php"
-	},
-	"extras":{
-		"caption" : "Extras",
-		"title" : "Links, Downloads, ein kleines Quiz und Trainingshelferlein",
-		"href" : "extras.php"
-	}
-}
diff --git a/homepage/redesign2018/markdownExperiment/.gitignore b/homepage/redesign2018/markdownExperiment/.gitignore
deleted file mode 100644
index dc5000f..0000000
--- a/homepage/redesign2018/markdownExperiment/.gitignore
+++ /dev/null
@@ -1,3 +0,0 @@
-*~
-temp/*
-
diff --git a/homepage/redesign2018/markdownExperiment/src/cwsvJudo-2018-navBar.css.bak b/homepage/redesign2018/markdownExperiment/src/cwsvJudo-2018-navBar.css.bak
deleted file mode 100644
index e01d952..0000000
--- a/homepage/redesign2018/markdownExperiment/src/cwsvJudo-2018-navBar.css.bak
+++ /dev/null
@@ -1,63 +0,0 @@
-/* 
- * Haupt-Navigationsleiste
-*/
-
-#mainNav{
-	display: inline-flex;
-	width: 98%;
-	margin: 1% 1% 1% 1%;
-	flex-direction: column;
-	align-items: stretch;
-/*
-	background: #FF8100;
-*/
-}
-#mainNav > a{
-	font-family: "Orbitron-Medium", Impact, Charcoal, sans-serif;
-	padding-top: .2em;/* wg. Orbitron */
-	font-size: 1.5em;
-	text-align: center;
-	text-decoration: none;
-	border-radius: 1em;
-	border-style: outset;
-	border-color: antiquewhite;
-	background: #FF8100;
-	color: inherit;
-}
-
-#mainNav a:hover{
-	text-decoration: underline overline;
-}
-.activeNav {
-	color: #A80101;
-	border-style: inset;
-}
-
-#mainNav > a > img{
-	display: none;
-	height: 1.5em;
-}
-
-@media (min-width: 640px){
-	#mainNav{
-		flex-direction: row;
-/*		justify-content: space-between;*/
-		justify-content: flex-start;
-	}
-	#mainNav > a{
-		border-radius: 0;
-	}
-}
-@media (min-width: 1280px){
-	#mainNav{
-		margin-top: 1vmin;
-		margin-bottom: 1vmin;
-	}
-	#mainNav > a > img{
-		display: initial;
-	}
-	#mainNav > a{
-		display: inline-flex;
-		align-items: center;
-	}
-}
diff --git a/homepage/redesign2018/markdownExperiment/src/cwsvJudo-2018-subNav.css.bak b/homepage/redesign2018/markdownExperiment/src/cwsvJudo-2018-subNav.css.bak
deleted file mode 100644
index 551caef..0000000
--- a/homepage/redesign2018/markdownExperiment/src/cwsvJudo-2018-subNav.css.bak
+++ /dev/null
@@ -1,65 +0,0 @@
-#mainNav {
-	display: flex;
-	flex-direction: row;
-	font-family: 'Orbitron-Ligth', sans-serif;
-	line-height: 1.6;
-	margin: .5em 0;
-	padding: 0;
-	border: 1px solid #a2a2a2;
-	background-color: #FF8100;
-	border-radius: .25em;
-}
-
-#mainNav > a {
-	color: #34495e;
-	text-decoration: none;
-	padding: 10px 15px;
-	text-transform: uppercase;
-	text-align: center;
-	display: block;
-	color: #34495e;
-}
-
-#mainNav > a > img{
-	height: 1em;
-	width: auto;
-}
-
-#mainNav a:hover {
-	background-color: #FFAE00;
-	color: #718daa;
-}
-
-
-
-
-/* ================================= 
-  Media Queries
-==================================== */
-
-
-
-
-@media (min-width: 640px) {
-	#mainNav {
-		display: flex;
-		flex-direction: row;
-		align-items: flex-end;
-	}
-	#mainNav > a > img{
-		display: none;
-	}
-	#mainNav > a > span{
-		display: initial;
-	}
-}
-
-@media (min-width: 1280px) {
-	#mainNav{
-		flex-direction: row;
-		justify-content: center;
-	}
-	#mainNav > a > img{
-		display: initial;
-	}
-}
diff --git a/homepage/redesign2018/markdownExperiment/verein.wettkampf.php b/homepage/redesign2018/markdownExperiment/verein.wettkampf.php
deleted file mode 100644
index f66efd4..0000000
--- a/homepage/redesign2018/markdownExperiment/verein.wettkampf.php
+++ /dev/null
@@ -1,352 +0,0 @@
-<?php
-	header("Content-Type: text/html; charset=utf-8");
-	header("Cache-Control: max-age=3600");
-	
-	require_once($_SERVER['DOCUMENT_ROOT']."/ressourcen/phpLib/miscAssis.php");
-	require_once($_SERVER['DOCUMENT_ROOT']."/ressourcen/phpLib/breadcrumbList.php");
-	require_once($_SERVER['DOCUMENT_ROOT']."/bonus/db.inc");
-	
-	// Deutsches Datumsformat
-	setlocale(LC_ALL, 'de_DE');
-	
-	$message = array();
-	
-	if(is_positive_integer($_GET['wkId'])){
-		$sqlConn = @new mysqli($db_server, $db_user, $db_password, $db_name);
-		if ($sqlConn->connect_error) {
-			$message['error'] .= "Datenbankverbindung fehlgeschlagen: " . $sqlConn->connect_error . "<br />";
-		}
-		else{
-			$wkData = getWkData($sqlConn, $_GET["wkId"]);
-			if( empty($wkData) ) $message['error'] .= "Fehler: WettkampfId ".$_GET['wkId']." nicht gefunden!<br />";
-		}
-	}
-	else $message['error'] .= "Fehler: wkId ist kein pos. Int (".$_GET['wkId'].")<br />";
-	
-	$breadcrumbs = array();
-	array_push($breadcrumbs,
-		array("linkTarget" => "http://cwsvjudo.bplaced.net/pages/desktop/", "linkTitle" => "Startseite der Homepage der Sektion Judo des Chemnitzer Freizeit- und Wohngebietssportvereines", "caption" => "<img class=\"charImg\" src=\"/ressourcen/graphiken/banner/cwsv-judo-logo.png\" alt=\"Judo im Chemnitzer WSV - Logo\" title=\"Judo im Chemnitzer WSV\" />")
-	);
-	array_push($breadcrumbs,
-		array("linkTarget" => "http://cwsvjudo.bplaced.net/pages/desktop/verein.wettkampfkalender.php", "linkTitle" => "Wettkampfkalender der Sektion Judo des Chemnitzer Freizeit- und Wohngebietssportvereines in Kontakt zu treten", "caption" => "Wettkampkalender")
-	);
-	if(is_positive_integer($_GET['wkId'])){
-		array_push($breadcrumbs,
-			array("linkTarget" => "http://cwsvjudo.bplaced.net/pages/desktop/verein.wettkampf.php?wkId=".$_GET['wkId'], "linkTitle" => "Wettkampf Nr. ".$GET['wkID'], "caption" => $_GET['wkId'])
-		);
-	}
-?>
-<!doctype html>
-<!--cwsvJudo Wettkampkalender-->
-<html lang="de">
-	<head>
-		<meta http-equiv="Content-Type" content="text/html; charset=utf-8" />
-		<title><?php echo (isset($_GET["jahr"]) ? "Wettkampfkalender ".$_GET["jahr"] : "Aktueller Wettkampfkalender")?> der Judoka des Chemnitzer WSV</title>
-		<meta name="description" content="<?php echo (isset($_GET["jahr"]) ? "Wettkampfkalender ".$_GET["jahr"] : "Aktueller Wettkampfkalender")?> der Abteilung Judo des Chemnitzer Freizeit- und Wohngebietssportvereines" />
-		<meta name="keywords" content="Termine, Wettkampf, Judo" />
-		<meta name="author" content="Marko Bunzel" />
-<!-- favIcon und Co nach der empfehlung von https://github.com/audreyr/favicon-cheat-sheet -->
-		<link rel="shortcut icon" type="image/x-icon" sizes="16x16 32x32 48x48 64x64" href="/ressourcen/graphiken/logos/favicon/favicon.ico">
-		<link rel="apple-touch-icon" sizes="152x152" href="/ressourcen/graphiken/logos/apple-touch-icon/apple-touch-icon-152.png" />
-		<link rel="apple-touch-icon" sizes="180x180" href="/ressourcen/graphiken/logos/apple-touch-icon/apple-touch-icon-180.png" />
-
-		<link rel="manifest" href="/manifest.json">
-
-		<link rel="canonical" href="http://cwsvjudo.bplaced.net/pages/desktop/verein.wettkampfkalender.php<?php echo isset($_GET["jahr"]) ? "?jahr=".$_GET["jahr"] : ""?>" />
-		<link rel="alternate" media="only screen and (max-width: 400px)" href="http://cwsvjudo.bplaced.net/pages/mobile/index.php" />
-
-		<meta name="viewport" content="width=device-width" />
-	</head>
-	
-	<body>
-	<!--Die Kopfzeile-->
-		<header>
-			<?php $bannerNumber=rand(1,7);?>
-			<img title="Judo im Chemnitzer WSV" alt="Judo im Chemnitzer WSV - Promo" class="styleBannerPromo" src=<?php echo "/ressourcen/graphiken/banner/bannerlogo.".$bannerNumber.".jpg"?> />
-			<img title="Judo im Chemnitzer WSV" alt="Judo im Chemnitzer WSV - Logo" class="styleBannerCwsv" src="/ressourcen/graphiken/banner/cwsv-judo-logo.png" />
-			<h1>Chemnitzer WSV e.&nbsp;V. - Judo</h1>
-			<?php echo htmlBreadcrumblist($breadcrumbs);?>
-		</header>
-	<!--Die Horizontale Navigationsleiste-->
-		<?php echo(
-			htmlNavBar(
-				[
-					['linkTarget' => "http://cwsvjudo.bplaced.net/pages/desktop/index.php", 'linkTitle' => "Homepage der Abteilung Judo des Chemnitzer WSV", 'caption' => "Home"],
-					['linkTarget' => "http://cwsvjudo.bplaced.net/pages/desktop/news.php", 'linkTitle' => "Bekanntmachungen der Abteilung Judo des Chemnitzer WSV", 'caption' => "News"],
-					['linkTarget' => "http://cwsvjudo.bplaced.net/pages/desktop/verein.php", 'linkTitle' => "Informationen über den Chemnitzer Freizeit- und Wohngebietssportverein und dessen Sektion Judo", 'caption' => "Verein"],
-					['linkTarget' => "http://cwsvjudo.bplaced.net/pages/desktop/extras.php", 'linkTitle' => "Einige kleine Extras und Helferlein", 'caption' => "Extras"],
-					['linkTarget' => "http://cwsvjudo.bplaced.net/pages/desktop/kontakt.php", 'linkTitle' => "Möglichkeiten mit dem Chemnitzer WSV in Kontakt zu treten", 'caption' => "Kontakt"],
-				], "navHori"
-			)
-		);?>
-		
-	<!-- Der eigentliche Inhalt -->
-		<div id="content">
-<?php
-	if(!empty($message)){
-?>
-		<div class="messageBox">
-			<?php echo $message['error']?>
-		</div>
-<?php
-	}
-?>
-<?php
-		if( !empty($wkData) ){
-?>
-			<h2>Wettkampfdaten <?php echo mb_convert_encoding($wkData['Veranstaltung'], 'UTF-8', 'ISO-8859-1');?></h2>
-			
-			<ul>
-				<li>Datum: <?php echo $wkData['Datum'] ?></li>
-				<li>AK: <?php echo mb_convert_encoding($wkData['Altersklassen'], 'UTF-8', 'ISO-8859-1');?></li>
-				<li>Ort: <?php echo mb_convert_encoding($wkData['Ort'], 'UTF-8', 'ISO-8859-1');?></li>
-				<li><a href="<?php echo $wkData['Ausschreibung'] ?>">Ausschreibung</a></li>
-				<li><a href="<?php echo $wkData['Routenplaner'] ?>">Routenplaner</a></li>
-				<li>Galerie: <?php echo $wkData['galleryLink'] ?></li>
-				<li>PromoPic: <?php echo $wkData['promoPic'] ?></li>
-			</ul>
-<?php
-		}
-?>
-
-<?php
-	include($_SERVER['DOCUMENT_ROOT']."/bonus/db.inc");
-	
-	try{
-		$db_connection = new PDO('mysql:host='.$db_server.';dbname='.$db_name, $db_user, $db_password);
-		
-	// mögliche Werte für das jahr herausfinden
-		$jahre = array();
-		$query = "SELECT DISTINCT DATE_FORMAT( Datum, '%Y') FROM cwsvjudo.wettkampfkalender WHERE 1 ORDER BY DATE_FORMAT( Datum,  '%Y' ) DESC";
-		$ergebnis = $db_connection->query($query);
-		foreach($ergebnis as $row){
-			array_push($jahre, $row["DATE_FORMAT( Datum, '%Y')"]);
-		}
-	// ist das übergebene jahr ein gültiges?
-		$jahr = $_GET["jahr"];
-		if($jahr){
-			if(in_array($jahr, $jahre)){
-				$minDate = $jahr."-01-01";
-				$maxDate = $jahr."-12-31";
-?>
-			<h2>
-				Wettkampfkalender <?php echo $jahr?>
-			</h2>
-<?php
-			}
-			else{
-				echo "Keine Wettkämpfe für das Jahr".$jahr." gefunden!";
-				die();
-			}
-		}
-		else{
-			$minDate = date("Y-m-d", time());
-			$maxDate = "";
-?>
-			<h2>
-				Kommende Wettkämpfe
-			</h2>
-<?php
-		}
-		
-		
-		$query="SELECT Datum,Veranstaltung,Ausschreibung,Ort,Routenplaner,Altersklassen,lfdeNr FROM wettkampfkalender WHERE Datum >= \"".$minDate."\" ORDER BY Datum ASC";
-		if($maxDate){
-			$query="SELECT Datum,Veranstaltung,Ausschreibung,Ort,Routenplaner,Altersklassen,lfdeNr FROM wettkampfkalender WHERE Datum >= \"".$minDate."\" AND Datum <= \"".$maxDate."\" ORDER BY Datum ASC";
-		}
-		$ergebnis = $db_connection->query($query);
-?>
-			<table class="wkKalender">
-				<thead>
-					<tr>
-						<th>
-							Datum
-						</th>
-						<th>
-							Veranstaltung
-						</th>
-						<th>
-							Ort
-						</th>
-						<th>
-							Altersklasse(n)
-						</th>
-						<th>
-							iCal
-						</th>
-					</tr>
-				</thead>
-				<tbody>
-<?php
-		$ergebnis = $db_connection->query($query);
-//		echo "Debug: " . gettype($ergebnis) . " " . count($ergebnis) . "\n";
-		foreach($ergebnis as $wk){
-?>
-					<tr>
-						<script type="application/ld+json">
-							{
-								"@context": "http://schema.org",
-								"@type": "Event",
-								"name": "<?php echo mb_convert_encoding($wk['Veranstaltung'], 'UTF-8', 'ISO-8859-1');?>",
-								"startDate": "<?php echo mb_convert_encoding($wk['Datum'], 'UTF-8', 'ISO-8859-1');?>",
-								"endDate": "<?php echo mb_convert_encoding($wk['Datum'], 'UTF-8', 'ISO-8859-1');?>",
-								"url": "http://cwsvjudo.bplaced.net<?php echo mb_convert_encoding($wk['Ausschreibung'], 'UTF-8', 'ISO-8859-1');?>",
-								"description": "Judo-Wettkampf der Altersklasse(n) <?php echo mb_convert_encoding($wk['Altersklassen'], 'UTF-8', 'ISO-8859-1');?>",
-								"location": {
-									"@type": "Place",
-									"name": "<?php echo mb_convert_encoding($wk['Ort'], 'UTF-8', 'ISO-8859-1');?>",
-									"address": {
-										"@type": "PostalAddress",
-										"addressLocality": "<?php echo mb_convert_encoding($wk['Ort'], 'UTF-8', 'ISO-8859-1');?>"
-									}
-								}
-							}
-							</script>
-						<td class="noWrap">
-							<time datetime="<?php echo mb_convert_encoding($wk['Datum'], 'UTF-8', 'ISO-8859-1');?>">
-								<?php echo strftime("%Y-%m-%d (%a)", strtotime($wk['Datum']) );?>
-							</time>
-						</td>
-						<td class="hyphenate">
-							<a title="Ausschreibung <?php echo mb_convert_encoding($wk['Veranstaltung'], 'UTF-8', 'ISO-8859-1');?>" href="<?php echo mb_convert_encoding($wk['Ausschreibung'], 'UTF-8', 'ISO-8859-1');?>"><span property="name"><?php echo mb_convert_encoding($wk['Veranstaltung'], 'UTF-8', 'ISO-8859-1');?></span></a>
-						</td>
-						<td>
-							<a title="Wegbeschreibung <?php echo mb_convert_encoding($wk['Veranstaltung'], 'UTF-8', 'ISO-8859-1');?>" href="<?php echo $wk['Routenplaner']?>"><span><?php echo mb_convert_encoding($wk['Ort'], 'UTF-8', 'ISO-8859-1');?></span></a>
-						</td>
-						<td>
-							<?php echo mb_convert_encoding($wk['Altersklassen'], 'UTF-8', 'ISO-8859-1');?>
-						</td>
-						<td>
-							<a title="Termin für <?php echo mb_convert_encoding($wk['Veranstaltung'], 'UTF-8', 'ISO-8859-1');?> in Kalender übernehmen" href="/ressourcen/phpLib/calendar.php?wkID=<?php echo $wk['lfdeNr']?>">iCal</a>
-						</td>
-					</tr>
-<?php
-		}
-?>
-				</tbody>
-				<tfoot>
-					<tr>
-						<th>
-							Datum
-						</th>
-						<th>
-							Veranstaltung
-						</th>
-						<th>
-							Ort
-						</th>
-						<th>
-							Altersklasse(n)
-						</th>
-						<th>
-							iCal
-						</th>
-					</tr>
-				</tfoot>
-			</table>
-			<div style="font-size:xx-small">
-				Alle Angaben ohne Gewähr! Fehler und Ergänzungen dürfen gerne gemeldet werden.
-			</div>
-			<a href="/downloads/Ausschreibungen/">Link zum Archiv mit allen Ausschreibungen</a>.
-<!--Ende dynamische Wettkampfliste-->
-			<hr />
-			<div  class="wkSelektor">
-				Im folgendem kann man sich mehrere Wettkampftermine in einer <a href="https://de.wikipedia.org/wiki/ICalendar">ICalendar</a>-Datei zusammenstellen. Zum An-/Abwählen bei gedrückter Strg-Taste mit der linken Maustaste die jeweiligen Wettkämpfe anklicken.
-				<form action="http://cwsvjudo.bplaced.net/ressourcen/phpLib/wkCustomICal.php" method="POST">
-					<label>Kommende Wettkämpfe:</label>
-					<div><select name="wkIDs[]" multiple="multiple" size="5">
-<?php
-					$ergebnis = $db_connection->query($query);
-					foreach($ergebnis as $wk){
-?>
-						<option value="<?php echo $wk['lfdeNr'];?>">
-							<?php echo mb_convert_encoding($wk['Datum'], 'UTF-8', 'ISO-8859-1');?>
-							--
-							<?php echo mb_convert_encoding($wk['Veranstaltung'], 'UTF-8', 'ISO-8859-1');?>
-							(<?php echo mb_convert_encoding($wk['Altersklassen'], 'UTF-8', 'ISO-8859-1');?>)
-						</option>
-<?php
-					}
-?>
-					</select></div>
-					<button type="submit">iCal erzeugen</button>
-				</form>
-<?php
-	// Verbindung wieder schließen
-		$db_connection = NULL;
-	}
-	catch(PDOException $db_error){
-		print "Error!: " . $db_error->getMessage() . "<br/>";
-		die();
-	}
-?>
-			</div>
-		</div> <!-- Ende div id content; des eigentlichen Inhaltes-->
-	<!-- Vertikale Navigationsleiste an der Seite-->
-		<div id="navVerti">
-			<nav><ul>
-<?php
-				if(!$_GET["jahr"]){
-					echo "<li class=\"activeNav\">kommende Wett&shy;k&auml;mpfe</li>";
-				}
-				else{
-					echo "<li><a href=\"/pages/desktop/verein.wettkampfkalender.php\">komm&shy;ende Wett&shy;k&auml;mpfe</a></li>";
-				}
-				foreach($jahre as $runner){
-					if($_GET["jahr"] == $runner){
-						echo "<li class=\"activeNav\"> Wett&shy;k&auml;mpfe ".$runner."</li>";
-					}
-					else{
-						echo "<li><a href=\"/pages/desktop/verein.wettkampfkalender.php?jahr=".$runner."\">Wett&shy;k&auml;mpfe ".$runner."</a></li>";
-					}
-				}
-?>
-			</ul></nav>
-			<hr />
-		<!--Anfang der Einbindung des Counters; die Zeile 'TEMPLATE;' DARF NICHT EINGERÜCKT SEIN-->
-			<div>
-			<?php
-				$chCounter_template = <<<TEMPLATE
-				<span class="bold">Besucher</span><br/>
-				Online: {V_VISITORS_CURRENTLY_ONLINE}<br/>
-				Heute: {V_VISITORS_TODAY}<br/>
-				Gestern: {V_VISITORS_YESTERDAY}<br/>
-				Tagesrekord: {V_MAX_VISITORS_PER_DAY}<br/>
-				Insgesamt: {V_TOTAL_VISITORS}<br/>
-				<span class="bold">Seitenaufrufe</span><br/>
-				Diese Seite: {V_PAGE_VIEWS_THIS_PAGE}<br/>
-				Insgesamt: {V_TOTAL_PAGE_VIEWS}<br/>
-TEMPLATE;
-				$chCounter_page_title = "Wettkampfkalender";
-				if($_GET["jahr"]){
-					$chCounter_page_title = "Wettkampfkalender ".$_GET["jahr"];
-				}
-				$chCounter_visible=1;
-				include($_SERVER['DOCUMENT_ROOT']."/expCounter/counter.php");
-?>
-			<!--Ende der Einbindung des Counters-->
-			</div>
-		</div>
-		
-		<?php include($_SERVER['DOCUMENT_ROOT']."/pages/shared/sponsorList.html.inc");?>
-		
-		<footer>
-			<p>
-				<?php
-					if($_GET["jahr"]){
-				?>
-						<a href="http://validator.w3.org/check?uri=http%3A%2F%2Fcwsvjudo.bplaced.net%2Fpages%2Fdesktop%2Fverein.wettkampfkalender.php?jahr=<?php echo $_GET["jahr"]?>">Valid <img src="http://www.w3.org/html/logo/downloads/HTML5_1Color_Black.svg" alt="HTML 5" style="height:1em"></a>
-				<?php
-					}
-					else{
-				?>
-					<a href="http://validator.w3.org/check?uri=http%3A%2F%2Fcwsvjudo.bplaced.net%2Fpages%2Fdesktop%2Fverein.wettkampfkalender.php">Valid <img src="http://www.w3.org/html/logo/downloads/HTML5_1Color_Black.svg" alt="HTML 5" style="height:1em"></a>
-				<?php
-					}
-				?>
-			</p>
-		</footer>
-<link rel="stylesheet" media="screen and (min-width: 641px)" href="/ressourcen/css/cwsvJudo.css" />
-<link rel="stylesheet" media="screen and (max-width: 640px)" href="/ressourcen/css/cwsvJudoMobile.css" />
-	</body>
-</html>
diff --git a/homepage/redesign2018/markdownExperiment/zopfli b/homepage/redesign2018/markdownExperiment/zopfli
deleted file mode 160000
index 6673e39..0000000
--- a/homepage/redesign2018/markdownExperiment/zopfli
+++ /dev/null
@@ -1 +0,0 @@
-Subproject commit 6673e39fba6122c948c9ec34f07166812d473eb6
diff --git a/homepage/redesign2018/optimized_contents.zip b/homepage/redesign2018/optimized_contents.zip
deleted file mode 100644
index 06d167c..0000000
Binary files a/homepage/redesign2018/optimized_contents.zip and /dev/null differ
diff --git a/homepage/redesign2018/php/config.inc.php b/homepage/redesign2018/php/config.inc.php
deleted file mode 100644
index 164e850..0000000
--- a/homepage/redesign2018/php/config.inc.php
+++ /dev/null
@@ -1,20 +0,0 @@
-<?php
-/// Die Basisdomain, unter der die Hauptseite zu erreichen ist
-	$baseDomain = "cwsvjudo.bplaced.net";
-/// Subdomain, unter dem dieses Verzeichnis zu finden ist (falls der Fall gegeben ist)
-	$subDomain = "";
-/// Basis(/Root)-Verzeichnis auf dem Server (für Dateizugriffe, insbesondere phpIncludes)
-	$basePath = "/users/cwsvjudo/www";
-
-/// Url zum Zugriff auf "shared Data" unter der Hauptadresse
-	$baseUrl = "http://".$baseDomain;
-/// Die kanonische Url dieses Verzeichnisses (unter welcher 
-/// Domainadresse die Seiten dieses Verzeichnisses bevorzugt zu 
-/// erreichen seien sollen, also entweder eine SubdomainUrl, oder die 
-/// baseUrl mit dem Verzeichnis angehängt)
-/// Achtung: Gedacht für eine einheitliche Bezeichnung bei internem 
-/// Verlinken. Der canonicalLink im Header ist bei ampSeiten nicht die 
-/// eigene Adresse, sondern die (kanonische) Adresse der "normalen" 
-/// Version der Seite.
-	$canonicalBaseUrl = "http://".$subDomain.".".$baseDomain;
-?>
diff --git a/homepage/redesign2018/php/index.php b/homepage/redesign2018/php/index.php
deleted file mode 100644
index d58323f..0000000
--- a/homepage/redesign2018/php/index.php
+++ /dev/null
@@ -1,87 +0,0 @@
-<?php
-/// Einbinden der Konfiguration, insbesondere Basisvariablen
-/// relative Pfadangabe, jedes Verzeichnis soll seine eigene haben
-	require_once("./config.inc.php");
-/// Daten für den Datenbankzugriff
-	require_once( $basePath."/bonus/db.inc");
-
-	header("Content-Type: text/html; charset=utf-8");
-	header("Cache-Control: max-age=3600");
-
-	require_once($basePath."/ressourcen/phpLib/breadcrumbList.php");
-//	require_once($basePath."/ressourcen/phpLib/miscAssis.php");
-
-	require_once($basePath."/ressourcen/phpLib/cwsvJudo/newsLib.php");
-	require_once($basePath."/ressourcen/phpLib/cwsvJudo/miscAssis.php");
-
-/// Eine Datenbankverbindung (über pdo) erstellen
-	try{
-		$db_connection = new PDO('mysql:host='.$db_server.';dbname='.$db_name, $db_user, $db_password);
-	}
-	catch(PDOException $db_error){
-		$siteData['errors'][] = "Error!: " . $db_error->getMessage();
-	}
-
-	if(isset($_GET['galId'])){
-		$redirectLink = $baseDomain."/pages/desktop/verein.galerien.php";
-		
-		if(is_positive_integer($_GET['galId'])){
-		// mögliche Werte für das jahr herausfinden
-			$query="SELECT url FROM wkGalerien WHERE id = \"".$_GET['galId']."\" ORDER BY Datum ASC LIMIT 1;";
-			try{
-				$ergebnis = $db_connection->query($query);
-				$galleryLink = $ergebnis->fetchAll();
-				header("Location: ".$baseDomain.$galleryLink[0]['url']);
-			}
-			catch(PDOException $db_error){
-				$siteData['errors'][] = "Error!: " . $db_error->getMessage();
-			}
-		}
-	}
-
-	$siteData['head']['canonicalLink'] = "http://cwsvjudo.bplaced.net";
-//	$siteData['alternateLink'] = "http://cwsvjudo.bplaced.net/pages/mobile/index.php";
-
-	$siteData['head']['title'] = "Judo im Chemnitzer WSV - Kinder- und Erwachsenentraining";
-	$siteData['head']['description'] = "Informationen zu Trainingszeiten, Wettk&auml;mpfen und anderen Veranstaltungen der Abteilung Judo des Chemnitzer Freizeit- und Wohngebietssportvereines";
-//	$siteData['head']['keywords'] = "Judo, Chemnitz, CWSV, Kampfsport, Verein, Sport, Heckert, Heckert Gebiet, 09120, Chemnitzer Freizeit- und Wohngebietssportverein, Sachsenhalle";
-	$siteData['head']['keywords'] = "Judo, Chemnitz, Chemnitzer Freizeit- und Wohngebietssportverein";
-	$siteData['head']['author'] = "Marko Bunzel";
-	$siteData['head']['ampLink'] = "http://amp.cwsvjudo.bplaced.net";
-
-	$siteData['head']['structuredDataJsons'][] = file_get_contents($basePath."/ressourcen/structuredData/json/cwsvJudo.json");
-	$siteData['head']['structuredDataJsons'][] = file_get_contents($basePath."/ressourcen/structuredData/json/cwsvJudoWebsite.json");
-
-	$siteData['header']['zitat'] = getRandomCite( $db_connection );
-
-//	$siteData['mainNav'] = jsonLinkFile2NavLinkList( "cwsvJudo-Links.json", ["home", "news", "verein", "extras", "kontakt"] );
-
-	$siteData['subNav'] = jsonLinkFile2NavLinkList( 
-		$basePath."/ressourcen/json/cwsvJudo-Links.json",
-		["trainingszeiten", "wettkampfkalender", "gallerien", "judowiki", "kontakt"] );
-
-	$newsList = getNews($db_connection, array('limit'=>6));
-	$siteData['mainContent'] = 
-		"<h2>Willkommen</h2>".
-		"<p>".
-			"auf der Website des Judo-Teams des <a href=\"http://www.cwsv-sport.de\" title=\"Homepage des Chemnitzer Freizeit- und Wohngebietssportvereines\">Chem&shy;nitzer Frei&shy;zeit- und Wohn&shy;gebiets&shy;sport&shy;vereines e.&nbsp;V.</a> ".
-			"Hier findet ihr Informationen zu den <a href=\"/pages/desktop/verein.training.php\" title=\"Trainingszeiten der Judoka des Chemnitzer Freizeit- und Wohngebietssportvereines\">Trainingszeiten</a> und <a href=\"/pages/desktop/verein.wettkampfkalender.php\" title=\"Wettkampfkalender der Judoka des CWSV\">Wettkampfterminen</a>. ".
-			"Ein kleines Wiki bietet <a title=\"Ein kleines Wiki über Judo\" href=\"/JudoWiki\">Wissenswertes über Judo</a>, wie zum Beispiel das <a title=\"Kyuprüfungsprogramme im Judo\" href=\"/JudoWiki/Kyu/Kyu\">Programm für die Gürtelprüfungen</a>.".
-		"</p>".
-		"<p>MsG marko</p>";
-		
-	$siteData['mainContent'] .=
-		"<h2>Die letzten Neuigkeiten</h2>";
-	
-	if( is_array( $newsList ) || is_object( $newsList ) )
-		foreach($newsList as $news)
-			$siteData['mainContent'] .= getHtmlNews($news, "headingLevel=3")."<hr />";
-	else
-		$siteData['mainContent'] .= "FEHLER: Keine Neuigkeiten gefunden!";
-	
-	$siteData['mainContent'] .=
-		"<a title=\"Alle Nachrichten der Abteilung Judo des Chemnitzer WSV\" href=\"news.php\">Zu den älteren Bekanntmachungen!</a>";
-
-	require_once('./template.php');
-exit();
-?>
diff --git a/homepage/redesign2018/php/template.php b/homepage/redesign2018/php/template.php
deleted file mode 100644
index 6443422..0000000
--- a/homepage/redesign2018/php/template.php
+++ /dev/null
@@ -1,145 +0,0 @@
-<?php
-/// Einbinden der Konfiguration, insbesondere Basisvariablen, 
-/// relative Pfadangabe
-///  - jedes Verzeichnis sollte seine eigene haben
-///  - theoretisch sollte es bereits von der aufrufenden Datei 
-///    eingebunden sein
-	require_once("./config.inc.php");
-
-	require_once($basePath."/ressourcen/phpLib/cwsvJudo/miscAssis.php");
-
-/// Den htmlCode für die Haupt-Navigationsleiste bereitstellen
-function getHtmlMainNav($someNavElements, $someOptions = array()){
-$retHtml = "";
-	foreach($someNavElements as $navElement){
-		$retHtml .= "<a class=\"mainNavElement".( !empty($navElement['isActive'])?" activeNav\"":"\"" );
-		$retHtml .= " title=\"".( !empty($navElement['title'])?$navElement['title']:"" )."\"";
-		$retHtml .= " href=\"".( !empty($navElement['href'])?$navElement['href']:"" )."\"";
-		$retHtml .= ">";
-		$retHtml .= !empty($navElement['icon']) ? "<img class=\"mainNavElementIcon\" src=\"".$navElement['icon']."\" alt=\"".(!empty($navElement['caption'])?$navElement['caption']:"Icon")."\" ".(!empty($navElement['title'])?"title=\"".$navElement['title']."\"":"").">" : "";
-		$retHtml .= "<span class=\"mainNavElementCaption\">".(!empty($navElement['caption']) ? $navElement['caption'] : "")."</span>";
-		$retHtml .= "</a>";
-	}
-return $retHtml;
-}
-
-/// Den htmlCode für die Unterauswahl-Navigationsleiste bereitstellen
-function getHtmlSubNav($someNavElements, $someOptions = array()){
-$retHtml = "";
-//	$retHtml .= "<nav class=\"subNav\">";
-	foreach($someNavElements as $navElement){
-		$retHtml .= "<a class=\"subNavElement".( !empty($navElement['isActive'])?" activeNav\"":"\"" );
-		$retHtml .= " title=\"".( !empty($navElement['title'])?$navElement['title']:"" )."\"";
-		$retHtml .= " href=\"".( !empty($navElement['href'])?$navElement['href']:"" )."\"";
-		$retHtml .= ">";
-		$retHtml .= !empty($navElement['icon']) ? "<img class=\"subNavElementIcon\" src=\"".$navElement['icon']."\" alt=\"".(!empty($navElement['caption'])?$navElement['caption']:"Icon")."\" ".(!empty($navElement['title'])?"title=\"".$navElement['title']."\"":"").">" : "";
-		$retHtml .= "<span class=\"subNavElementCaption\">".(!empty($navElement['caption']) ? $navElement['caption'] : "")."</span>";
-		$retHtml .= "</a>";
-	}
-//	$retHtml .= "</nav>";
-return $retHtml;
-}
-?>
-<!doctype html>
-<html lang="de">
-	<head>
-		<meta http-equiv="Content-Type" content="text/html; charset=utf-8" />
-		<title><?php echoThisOrThat( $siteData['head']['title'], "Judo im Chemnitzer WSV" );?></title>
-		<meta name="description" content="<?php echoThisOrThat( $siteData['head']['description'], "Informationen zu Trainingszeiten, Wettk&auml;mpfen und anderen Veranstaltungen der Abteilung Judo des Chemnitzer Freizeit- und Wohngebietssportvereines");?>" />
-		<meta name="keywords" content="<?php echoThisOrThat( $siteData['head']['keywords'], "Judo, Chemnitz, CWSV, Kampfsport, Verein, Sport, Heckert, Heckert Gebiet, 09120, Chemnitzer Freizeit- und Wohngebietssportverein, Sachsenhalle");?>" />
-		<meta name="author" content="<?php echoThisOrThat( $siteData['head']['author'], "Marko Bunzel");?>" />
-<!-- favIcon und Co nach der empfehlung von https://github.com/audreyr/favicon-cheat-sheet -->
-		<?php require_once($basePath."/pages/shared/favicon.html.inc");?>
-		<link rel="canonical" href="<?php echoThisOrThat( $siteData['head']['canonicalLink'], "http://cwsvjudo.bplaced.net/pages/desktop/", $_SERVER['REQUEST_URI'] );?>" />
-<!--ampVersion Version-->
-		<?php echoThisWhenThat("<link rel=\"amphtml\" href=\"".$siteData['head']['ampLink']."\" />", $siteData['head']['ampLink']);?>
-		<meta name="viewport" content="width=device-width" />
-<!-- Strukturierte Daten im header -->
-		<?php foreach( $siteData['head']['structuredDataJsons'] as $jsonString){
-			echo("<script type=\"application/ld+json\">".$jsonString."</script>");
-		}?>
-		<link rel="alternate" type="application/rss+xml" href="/rss.php">
-<!--Alte Stylesheets-->
-		<link rel="stylesheet" media="screen and (max-width: 640px)" href="/ressourcen/css/cwsvJudoMobile2017.css" />
-		<link rel="stylesheet" media="screen and (min-width: 641px)" href="/ressourcen/css/cwsvJudo2017.css" />
-<!--Neues, zusammengefasstes Stylesheet-->
-		<link rel="stylesheet" href="<?php echo($baseUrl);?>/ressourcen/css/cwsvJudo-2018.css" />
-	</head>
-	
-	<body>
-
-<!-- Kopfzeile mit Titel, Promobildern und Breadcrumbs -->
-		<header class="cwsvHeader">
-			<div class="cwsvHeaderPromoPic">
-				<?php $bannerNumber=rand(1,7);?>
-				<img width="200" height="140" title="Judo im Chemnitzer WSV" alt="Judo im Chemnitzer WSV - Promo" src=<?php echo "/ressourcen/graphiken/banner/bannerlogo.".$bannerNumber.".jpg"?> />
-			</div>
-			<div class="cwsvHeaderTitle">
-				<h1>
-					<?php echoThisOrThat( $siteData['header']['h1'], "Judo");?>
-				</h1>
-				<div class="breadcrumbs">
-					<?php echo( !empty($siteData['header']['breadcrumbs'])?htmlBreadcrumblist($siteData['header']['breadcrumbs']):(empty($siteData['header']['zitat']['zitat'])?"":"<em class=\"cwsvHeaderZitat\">&bdquo;".$siteData['header']['zitat']['zitat']."&rdquo;</em>"));?>
-				</div>
-			</div>
-			<div class="cwsvHeaderLogoPic">
-				<img width="250" height="200" title="Judo im Chemnitzer WSV" alt="Judo im Chemnitzer WSV - Logo" src="/ressourcen/graphiken/banner/cwsv-judo-logo.png" />
-			</div>
-		</header>
-
-	<!--Die Horizontale Navigationsleiste-->
-		<nav class="mainNav">
-<?php
-			$siteData['mainNav'] = 
-				jsonLinkFile2NavLinkList( 
-					$basePath."/ressourcen/json/cwsvJudo-Links.json", 
-					["home", "verein"] );
-//					["home", "news", "verein", "extras", "kontakt"] );
-			echo( getHtmlMainNav( $siteData['mainNav']) );
-?>
-		</nav>
-
-	<!--Die Unternavigation-->
-		<nav class="subNav">
-<?php
-//			var_dump($siteData['subNav']);
-			echo( getHtmlSubNav( $siteData['subNav']) );
-?>
-		</nav>
-
-	<!-- Der eigentliche Inhalt -->
-		<div id="content">
-			<?php echo($siteData['mainContent']);?>
-		</div>
-
-	<!-- Vertikale Navigationsleiste an der Seite-->
-		<aside class="sideNotes">
-		<!--Anfang der Einbindung des Counters; die Zeile 'TEMPLATE;' DARF NICHT EINGERÜCKT SEIN-->
-			<div class="expCounter">
-			<?php
-				$chCounter_template = <<<TEMPLATE
-				<span class="bold">Besucher</span><br/>
-				Online: {V_VISITORS_CURRENTLY_ONLINE}<br/>
-				Heute: {V_VISITORS_TODAY}<br/>
-				Gestern: {V_VISITORS_YESTERDAY}<br/>
-				Tagesrekord: {V_MAX_VISITORS_PER_DAY}<br/>
-				Insgesamt: {V_TOTAL_VISITORS}<br/>
-				<span class="bold">Seitenaufrufe</span><br/>
-				Diese Seite: {V_PAGE_VIEWS_THIS_PAGE}<br/>
-				Insgesamt: {V_TOTAL_PAGE_VIEWS}<br/>
-TEMPLATE;
-				$chCounter_page_title = "Desktop-Startseite";
-				$chCounter_visible=1;
-				include($_SERVER['DOCUMENT_ROOT']."/expCounter/counter.php");
-			?>
-			<!--Ende der Einbindung des Counters-->
-			</div>
-		<?php include($_SERVER['DOCUMENT_ROOT']."/pages/shared/sponsorList.html.inc");?>
-		</aside>
-
-<!-- Fußzeile mit Standardlinks -->
-		<footer class="footerBar">
-			<a class="touchLink" title="Seite auf HTML 5 Konformität prüfen" href="http://validator.w3.org/check?uri=<?php echo(urlencode(getCurPagesUrl()));?>" rel="nofollow">Valid <img src="http://www.w3.org/html/logo/downloads/HTML5_1Color_Black.svg" alt="HTML 5" title="HTML 5 Logo" class="charImg"></a>
-			<a class="touchLink" title="Möglichkeiten mit dem Chemnitzer Freizeit- und Wohngebietssportverein in Kontakt zu treten" href="<?php echo($baseUrl);?>/pages/desktop/kontakt.php" >Kontakt</a>
-		</footer>
-</html>
diff --git a/homepage/redesign2018/test.css b/homepage/redesign2018/test.css
deleted file mode 100644
index c007435..0000000
--- a/homepage/redesign2018/test.css
+++ /dev/null
@@ -1,1098 +0,0 @@
-/*
- * Hauptinhalt
- */
-
-#content {
-	background: #FFAE00;
-}
-/*
- * Schriftarten
- */
-@font-face {
-	font-family: Orbitron-Medium;
-	src: url(/ressourcen/fonts/Orbitron-Medium.otf);
-}
-
-/**
- * Schriftgrößen
- */
-body{
-	font-size: 4vw;
-}
-@media (min-width: 640px){
-	body{
-		font-size: 2vw;
-	}
-}
-@media (min-width: 1280px){
-	body{
-		font-size: 1.3vw;
-	}
-}
-
-/*
- * Ein Reset für das BoxSizing
- * Wir wollen Maße auf die "äußere Boundingbox" beziehen
- */
-
-html{
-	box-sizing: border-box;
-}
-*, ::before, ::after {
-	box-sizing: inherit;
-}
-
-/*
- * Body
- */
-body{
-	background: #FFAE00;
-	font-family: arial, helvetica, sans-serif;
-}
-
-
-/* Container für eine einzelne News */
-.newsBox{
-	border: solid 1px #000000;
-	padding: 1vmin;
-	margin: 1vmin;
-	display: flex;
-	flex-direction:column;
-}
-.newsBoxHeader{
-	background: #FF8100;
-	display: flex;
-	flex-direction: column;
-}
-.newsBoxFooter{
-	clear: both;
-	background: #FF8100;
-}
-
-
-/*
- * Sidenotes und ihre Kinder
- */
-
-.expCounter{
-	display: none;
-	margin-top: 5%;
-	margin-bottom: 5%;
-}
-
-
-/*
- * Wettkampfkalender
-*/
-
-/*
-.wkKalender th {
-	background-color: #666; 
-	color: #fff;
-}
-.wkKalenderMonth {
-	background-color: #666; 
-	color: #fff;
-	
-}
-.wkKalender tr {
-	background-color: #FFAE00;
-	color: #000;
-}
-.wkKalender tr:nth-child(odd) {
-	background-color: #FF8100 ;
-}
-*/
-
-/*
- * Allgemeine Formatierungen als class
- */
-
-.larger{
-	font-size: larger;
-}
-.bold{
-	font-weight: bold;
-}
-.floatLeft{
-	float: left;
-}
-.fullWidth{
-	width:100%;
-}
-
-/* Bilder in voller Breite */
-.bigPicture{
-	width: 100%;
-	height: auto;
-}
-
-/* Orbitronschrift inkl. top-padding-Korrektur */
-.orbitronMediumFont{
-	font-family: "Orbitron-Medium", Impact, Charcoal, sans-serif;
-	padding-top: .2em;/* wg. Orbitron */
-}
-
-/* touchable Links*/
-.touchLink{
-	display: inline-block;
-	padding: 0.25em 0 0.25em 0;
-	margin: 0.25em 0 0.25em 0;
-	background-color: #FF8100;
-	border-radius: .5em;
-}
-
-.hyphenate{
-	hyphens: auto;
-}
-
-.pngAddress{
-	width: 17em;
-	height: auto;
-	vertical-align: middle;
-}
-
-.charImg{
-	height: 1em;
-	display: inline;
-	vertical-align: middle;
-}
-
-.noWrap{
-	white-space:nowrap;
-}
-
-.floatClearBoth{
-	clear: both;
-}
-
-/*
- * Fußzeile
- */
-
-.footerBar{
-	display: flex;
-	flex-direction: row;
-	flex-wrap: wrap;
-	justify-content: center;
-}
-.footerBarLinkButton{
-	border-style: outset;
-	padding: 1vmin;
-}
-
-/*
- * Die Headerleiste
- */
-
-header {
-	font-family: Orbitron-Medium;
-	text-align: center;
-	clear: both;
-/*	float: left;*/
-	width: 98%;
-	margin: 0 1% 0 1%;
-	background-color: #FF8100;
-}
-
-header img{
-	display: block; /*inline elemente wie img fügen standardmäßig eine bottom margin hinzu (für schriftzeichen, die unter die Grundlinie gehen)*/
-}
-img.styleBannerPromo{
-	width:20%;
-	height:auto;
-	float:left;
-}
-img.styleBannerCwsv{
-	width:17.5%;
-	height:auto;
-	float:right;
-}
-
-
-.cwsvHeader{
-	display: flex;
-	justify-content: space-between;
-	flex-direction: row;
-	align-items: stretch;
-	text-align: center;
-	background-color: #FF8100;
-}
-
-.cwsvHeaderZitat{
-	font-family: "Orbitron-Medium", Impact, Charcoal, sans-serif;
-	padding-top: .2em;/* wg. Orbitron */
-}
-
-.cwsvHeaderTitle{
-	display: flex;
-	flex-direction: column;
-	justify-content: space-around;
-	align-items: center;
-	font-family: "Orbitron-Medium", Impact, Charcoal, sans-serif;
-	padding-top: .2em;
-}
-.cwsvHeaderTitle h1{
-	font-size: 1.5em;
-}
-.cwsvHeaderPromoPic{
-	display: none;
-	height: 5em;
-}
-
-.cwsvHeaderPromoPic img{
-	height: 100%;
-	width: auto;
-}
-.cwsvHeaderLogoPic{
-	height: 5em;
-}
-.cwsvHeaderLogoPic img{
-	height: 100%;
-	width: auto;
-}
-
-/* \0000a0 ist unicode für &nbsp;
- * \00202F ist unicode für &thinsp;*/
-.cwsvHeaderTitle h1::before{
-	content: 'CWSV\0000a0e.\00202FV. - ';
-}
-@media (min-width: 640px){
-	.cwsvHeaderTitle h1::before{
-		content: 'Chemnitzer WSV\0000a0e.\00202FV. - ';
-	}
-}
-@media (min-width: 1280px){
-	.cwsvHeaderTitle h1::before{
-		content: 'Chemnitzer Freizeit- und Wohngebietssportverein\0000a0e.\00202FV. - ';
-	}
-}
-
-
-@media (min-width: 1280px){
-	.cwsvHeaderPromoPic{
-		display: initial;
-	}
-	.cwsvHeaderLogoPic{
-	}
-}
-body{
-	display: flex;
-	flex-direction: column;
-}
-
-body > * {
-	flex-basis: 100%;
-}
-
-.cwsvHeader{
-	order: 1;
-}
-.mainNav{
-	order: 4;
-}
-.subNav{
-	order: 2;
-}
-#content{
-	order: 3;
-}
-.sideNotes{
-	order: 5;
-}
-.footerBar{
-	order: 6;
-}
-
-@media(min-width: 640px) and (max-width: 1279px){
-	body{
-		display: block;
-	}
-	.subNav{
-		float: right;
-		width: 33%;
-	}
-	#content {
-		float: left;
-		width: 67%;
-/*		margin: 1%;
-		padding: 1%;
-*/
-	}
-	.sideNotes{
-		float: right;
-		width: 33%;
-	}
-	.footerBar{
-		clear: both;
-	}
-}
-
-
-@media(min-width: 1280px){
-	body{
-		flex-direction: row;
-		flex-wrap: wrap;
-	}
-	.mainNav{
-		order: 2;
-	}
-	.subNav{
-		order: 3;
-		flex-basis: 25%;
-		align-self: flex-start;
-	}
-	#content{
-		order: 4;
-		flex-basis: 50%;
-	}
-	.sideNotes{
-		align-self: flex-start;
-		flex-basis: 25%;
-	}
-}
-/* 
- * Haupt-Navigationsleiste
-*/
-
-.mainNav{
-	display: inline-flex;
-	width: 98%;
-	margin: 1% 1% 1% 1%;
-	flex-direction: column;
-	align-items: stretch;
-/*
-	background: #FF8100;
-*/
-}
-.mainNavElement{
-	font-family: "Orbitron-Medium", Impact, Charcoal, sans-serif;
-	padding-top: .2em;/* wg. Orbitron */
-	font-size: 1.5em;
-	text-align: center;
-	text-decoration: none;
-	border-radius: 1em;
-	border-style: outset;
-	border-color: antiquewhite;
-	background: #FF8100;
-}
-
-.mainNav a{
-	color: inherit;
-}
-.mainNav a:hover{
-	text-decoration: underline overline;
-}
-.activeNav {
-	color: #A80101;
-	border-style: inset;
-}
-
-.mainNavElementIcon{
-	display: none;
-}
-
-@media (min-width: 640px){
-	.mainNav{
-		flex-direction: row;
-		justify-content: space-between;
-	}
-	.mainNavElement{
-		flex-basis: 20%;
-		border-radius: 0;
-	}
-}
-@media (min-width: 1280px){
-	.mainNav{
-		margin-top: 1vmin;
-		margin-bottom: 1vmin;
-	}
-}
-.newsArtikel{
-	width: 100%;
-	background-color: #FFAE00;
-	box-shadow: 0 1px 2px 0 rgba(0,0,0,.5);
-	display: flex;
-	flex-direction: column;
-}
-.newsHeader{
-	display: flex;
-	align-items: stretch;
-	justify-content: space-between;
-	background-color: #FF8100;
-}
-.newsDatum{
-	white-space: nowrap;
-	align-self: center;
-}
-.newsBetreff{
-	margin: auto;
-	margin-left: 1vw;
-	margin-right: 1vw;
-	text-align: end;
-	flex-grow: 1;
-}
-
-.newsPromoImage{
-	float: left;
-}
-
-.newsText{
-	margin: 1vw;
-}
-/*schlechter Hack, der entfernt werden sollte wenn die Kompatibilität mit Datenbank hergestellt ist*/
-.newsText a {
-	float: none;
-	box-shadow: none;
-}
-.newsText img{
-	max-width: 100%;
-	display: block;
-	margin: auto;
-	box-shadow: 0 1px 2px 0 rgba(0,0,0,.5);
-}
-.newsFooter{
-	background-color: #FF8100;
-}
-.newsAutor::before{ 
-    content: "Msg\0000a0";
-}
-.sponsorList ul li img {
-	width: 100%;
-	height: auto;
-}
-/*
- * Unterauswahl-Navigationsleiste
- */
-
-/* der SubNavContainer*/
-.subNav{
-	display: flex;
-	flex-direction: row;
-	align-items: stretch;
-	justify-content: space-between;
-}
-
-.subNavElement{
-	background: #FF8100;
-	padding-top:.125em;
-	padding-left:.125em;
-	padding-right:.125em;
-	border-radius: 1em;
-	border-style: outset;
-	border-color: antiquewhite;
-	text-decoration: none;
-	flex-basis: 20%;
-	display: flex;
-	justify-content: center;
-	align-items: center;
-	text-align: center;
-}
-
-.subNav a{
-	color: inherit;
-	border-color: antiquewhite;
-}
-
-.subNavElementIcon{
-	text-align: center;
-	max-width: 2.5em;
-	height: auto;
-	padding: .125em;
-}
-
-.subNavElementCaption{
-	display: none;
-}
-
-@media (min-width: 640px){
-	.subNav{
-		flex-direction: column;
-	}
-	.subNavElement{
-		border-radius: 0;
-	}
-	.subNavElementIcon{
-		display: none;
-	}
-	.subNavElementCaption{
-		display: initial;
-		font-family: "Orbitron-Medium", Impact, Charcoal, sans-serif;
-		padding-top: .2em;
-	}
-}
-
-@media (min-width: 1280px){
-	.subNavElement{
-		padding: 1vmin;
-	}
-}
-.wkKalender{
-	width: 100%;
-	max-width: 100%;
-	background-color: #FFAE00;
-	margin-bottom: 0;
-}
-
-.wkKalender > thead,
-.wkKalender > tfoot {
-	display: none;
-}
-
-.wkKalender > tbody {
-	display: block;
-}
-
-.wkKalender > tbody > tr:empty,
-.wkKalender > tbody > tr > th:empty{
-	display: none;
-}
-.wkKalender > tbody > tr {
-	display: block;
-	border: 1px solid #e0e0e0;
-	border-radius: 2px;
-	margin-bottom: 1.6rem;
-}
-
-.wkKalender th {
-	display: block;
-	background-color: #666;
-	color: #fff;
-}
-
-.wkKalender > tbody > tr > td {
-	display: block;
-	vertical-align: middle;
-	text-align: right;
-}
-.wkKalender > tbody > tr > td:nth-child(odd) {
-	background-color: #FF8100;
-}
-.wkKalender > tbody > tr > td[data-title]:before {
-	content: attr(data-title);
-	float: left;
-	font-size: inherit;
-	font-weight: 400;
-	color: #757575;
-}
-
-
-@media screen and (min-width: 1280px){
-	.wkKalender > thead{
-		display: table-header-group;
-		width: 100%;
-	}
-	.wkKalender > tbody > tr{
-		display: table-row;
-		width: 100%;
-	}
-	.wkKalender > tbody > tr > td {
-		display: table-cell;
-	}
-	.wkKalender > tbody > tr > td[data-title]:before {
-		display: none;
-		content: "";
-	}
-	.wkKalender > tbody{
-		display: table-row-group;
-	}
-	.wkKalender > tfoot{
-		display: table-footer-group;
-	}
-	.wkKalender > tbody > tr {
-		border: 1px solid #e0e0e0;
-		border-radius: 2px;
-		margin-bottom: 1.6rem;
-	}
-	.wkKalender > tbody > tr > td {
-		vertical-align: middle;
-		text-align: initial;
-	}
-	.wkKalender > tbody > tr:nth-child(odd) {
-		background-color: #FF8100;
-	}
-	.wkKalender > tbody > tr > td:nth-child(odd) {
-		background-color: inherit;
-	}
-	.wkKalender > tbody > tr > td[data-title]:before {
-		content: initial;
-	}
-	.wkKalender tr, th, td {
-		border: 1px solid black;
-	}
-	.wkKalender th {
-		display: table-cell;
-	}
-}
-
-.displayNone{
-	display: none;
-}
-
-/*abgeschaut*/
-.shadow-z-1 {
-	box-shadow: 0 1px 3px 0 rgba(0, 0, 0, 0.12), 0 1px 2px 0 rgba(0, 0, 0, 0.24);
-}
-
-
-/* -- Material Design Table style -------------- */
-/*
-.wkKalender > thead > tr,
-.wkKalender > tbody > tr,
-.wkKalender > tfoot > tr {
-	transition: all 0.3s ease;
-}
-
-.wkKalender > thead > tr > th,
-.wkKalender > tbody > tr > th,
-.wkKalender > tfoot > tr > th,
-.wkKalender > thead > tr > td,
-.wkKalender > tbody > tr > td,
-.wkKalender > tfoot > tr > td {
-	text-align: left;
-	padding: 1.6rem;
-	vertical-align: top;
-	border-top: 0;
-	transition: all 0.3s ease;
-}
-.wkKalender > thead > tr > th {
-	font-weight: 400;
-	color: #757575;
-	vertical-align: bottom;
-	border-bottom: 1px solid rgba(0, 0, 0, 0.12);
-}
-.wkKalender > caption + thead   > tr:first-child > th,
-.wkKalender > colgroup + thead  > tr:first-child > th,
-.wkKalender > thead:first-child > tr:first-child > th,
-.wkKalender > caption + thead   > tr:first-child > td,
-.wkKalender > colgroup + thead  > tr:first-child > td,
-.wkKalender > thead:first-child > tr:first-child > td {
-	border-top: 0;
-}
-.wkKalender > tbody + tbody {
-	border-top: 1px solid rgba(0, 0, 0, 0.12);
-}
-.wkKalender .table {
-	background-color: #fff;
-}
-.wkKalender .no-border {
-	border: 0;
-}
-@media screen and (max-width: 640px){
-  .table-responsive-vertical.shadow-z-1 > .table > tbody > tr {
-    border: none;
-    -webkit-box-shadow: 0 1px 3px 0 rgba(0, 0, 0, 0.12), 0 1px 2px 0 rgba(0, 0, 0, 0.24);
-    -moz-box-shadow: 0 1px 3px 0 rgba(0, 0, 0, 0.12), 0 1px 2px 0 rgba(0, 0, 0, 0.24);
-    box-shadow: 0 1px 3px 0 rgba(0, 0, 0, 0.12), 0 1px 2px 0 rgba(0, 0, 0, 0.24);
-  }
-  .wkKalender-bordered {
-    border: 0;
-  }
-  .wkKalender-bordered > tbody > tr > td {
-    border: 0;
-    border-bottom: 1px solid #e0e0e0;
-  }
-  .wkKalender-bordered > tbody > tr > td:last-child {
-    border-bottom: 0;
-  }
-  .wkKalender-striped > tbody > tr > td,
-  .wkKalender-striped > tbody > tr:nth-child(odd) {
-    background-color: #fff;
-  }
-  .wkKalender-striped > tbody > tr > td:nth-child(odd) {
-    background-color: #f5f5f5;
-  }
-  .wkKalender-hover > tbody > tr:hover > td,
-  .wkKalender-hover > tbody > tr:hover {
-    background-color: #fff;
-  }
-  .wkKalender-hover > tbody > tr > td:hover {
-    background-color: rgba(0, 0, 0, 0.12);
-  }
-}
-
-.wkKalender-striped.table-mc-red > tbody > tr:nth-child(odd) > td,
-.wkKalender-striped.table-mc-red > tbody > tr:nth-child(odd) > th {
-  background-color: #fde0dc;
-}
-.wkKalender-hover.table-mc-red > tbody > tr:hover > td,
-.wkKalender-hover.table-mc-red > tbody > tr:hover > th {
-  background-color: #f9bdbb;
-}
-@media screen and (max-width: 767px) {
-  .table-responsive-vertical .table-striped.table-mc-red > tbody > tr > td,
-  .table-responsive-vertical .table-striped.table-mc-red > tbody > tr:nth-child(odd) {
-    background-color: #fff;
-  }
-  .table-responsive-vertical .table-striped.table-mc-red > tbody > tr > td:nth-child(odd) {
-    background-color: #fde0dc;
-  }
-  .table-responsive-vertical .table-hover.table-mc-red > tbody > tr:hover > td,
-  .table-responsive-vertical .table-hover.table-mc-red > tbody > tr:hover {
-    background-color: #fff;
-  }
-  .table-responsive-vertical .table-hover.table-mc-red > tbody > tr > td:hover {
-    background-color: #f9bdbb;
-  }
-}
-.wkKalender-striped.table-mc-pink > tbody > tr:nth-child(odd) > td,
-.wkKalender-striped.table-mc-pink > tbody > tr:nth-child(odd) > th {
-  background-color: #fce4ec;
-}
-.wkKalender-hover.table-mc-pink > tbody > tr:hover > td,
-.wkKalender-hover.table-mc-pink > tbody > tr:hover > th {
-  background-color: #f8bbd0;
-}
-@media screen and (max-width: 767px) {
-  .table-responsive-vertical .table-striped.table-mc-pink > tbody > tr > td,
-  .table-responsive-vertical .table-striped.table-mc-pink > tbody > tr:nth-child(odd) {
-    background-color: #fff;
-  }
-  .table-responsive-vertical .table-striped.table-mc-pink > tbody > tr > td:nth-child(odd) {
-    background-color: #fce4ec;
-  }
-  .table-responsive-vertical .table-hover.table-mc-pink > tbody > tr:hover > td,
-  .table-responsive-vertical .table-hover.table-mc-pink > tbody > tr:hover {
-    background-color: #fff;
-  }
-  .table-responsive-vertical .table-hover.table-mc-pink > tbody > tr > td:hover {
-    background-color: #f8bbd0;
-  }
-}
-.wkKalender-striped.table-mc-purple > tbody > tr:nth-child(odd) > td,
-.wkKalender-striped.table-mc-purple > tbody > tr:nth-child(odd) > th {
-  background-color: #f3e5f5;
-}
-.wkKalender-hover.table-mc-purple > tbody > tr:hover > td,
-.wkKalender-hover.table-mc-purple > tbody > tr:hover > th {
-  background-color: #e1bee7;
-}
-@media screen and (max-width: 767px) {
-  .table-responsive-vertical .table-striped.table-mc-purple > tbody > tr > td,
-  .table-responsive-vertical .table-striped.table-mc-purple > tbody > tr:nth-child(odd) {
-    background-color: #fff;
-  }
-  .table-responsive-vertical .table-striped.table-mc-purple > tbody > tr > td:nth-child(odd) {
-    background-color: #f3e5f5;
-  }
-  .table-responsive-vertical .table-hover.table-mc-purple > tbody > tr:hover > td,
-  .table-responsive-vertical .table-hover.table-mc-purple > tbody > tr:hover {
-    background-color: #fff;
-  }
-  .table-responsive-vertical .table-hover.table-mc-purple > tbody > tr > td:hover {
-    background-color: #e1bee7;
-  }
-}
-.wkKalender-striped.table-mc-deep-purple > tbody > tr:nth-child(odd) > td,
-.wkKalender-striped.table-mc-deep-purple > tbody > tr:nth-child(odd) > th {
-  background-color: #ede7f6;
-}
-.wkKalender-hover.table-mc-deep-purple > tbody > tr:hover > td,
-.wkKalender-hover.table-mc-deep-purple > tbody > tr:hover > th {
-  background-color: #d1c4e9;
-}
-@media screen and (max-width: 767px) {
-  .table-responsive-vertical .table-striped.table-mc-deep-purple > tbody > tr > td,
-  .table-responsive-vertical .table-striped.table-mc-deep-purple > tbody > tr:nth-child(odd) {
-    background-color: #fff;
-  }
-  .table-responsive-vertical .table-striped.table-mc-deep-purple > tbody > tr > td:nth-child(odd) {
-    background-color: #ede7f6;
-  }
-  .table-responsive-vertical .table-hover.table-mc-deep-purple > tbody > tr:hover > td,
-  .table-responsive-vertical .table-hover.table-mc-deep-purple > tbody > tr:hover {
-    background-color: #fff;
-  }
-  .table-responsive-vertical .table-hover.table-mc-deep-purple > tbody > tr > td:hover {
-    background-color: #d1c4e9;
-  }
-}
-.wkKalender-striped.table-mc-indigo > tbody > tr:nth-child(odd) > td,
-.wkKalender-striped.table-mc-indigo > tbody > tr:nth-child(odd) > th {
-  background-color: #e8eaf6;
-}
-.wkKalender-hover.table-mc-indigo > tbody > tr:hover > td,
-.wkKalender-hover.table-mc-indigo > tbody > tr:hover > th {
-  background-color: #c5cae9;
-}
-@media screen and (max-width: 767px) {
-  .table-responsive-vertical .table-striped.table-mc-indigo > tbody > tr > td,
-  .table-responsive-vertical .table-striped.table-mc-indigo > tbody > tr:nth-child(odd) {
-    background-color: #fff;
-  }
-  .table-responsive-vertical .table-striped.table-mc-indigo > tbody > tr > td:nth-child(odd) {
-    background-color: #e8eaf6;
-  }
-  .table-responsive-vertical .table-hover.table-mc-indigo > tbody > tr:hover > td,
-  .table-responsive-vertical .table-hover.table-mc-indigo > tbody > tr:hover {
-    background-color: #fff;
-  }
-  .table-responsive-vertical .table-hover.table-mc-indigo > tbody > tr > td:hover {
-    background-color: #c5cae9;
-  }
-}
-.wkKalender-striped.table-mc-blue > tbody > tr:nth-child(odd) > td,
-.wkKalender-striped.table-mc-blue > tbody > tr:nth-child(odd) > th {
-  background-color: #e7e9fd;
-}
-.wkKalender-hover.table-mc-blue > tbody > tr:hover > td,
-.wkKalender-hover.table-mc-blue > tbody > tr:hover > th {
-  background-color: #d0d9ff;
-}
-@media screen and (max-width: 767px) {
-  .table-responsive-vertical .table-striped.table-mc-blue > tbody > tr > td,
-  .table-responsive-vertical .table-striped.table-mc-blue > tbody > tr:nth-child(odd) {
-    background-color: #fff;
-  }
-  .table-responsive-vertical .table-striped.table-mc-blue > tbody > tr > td:nth-child(odd) {
-    background-color: #e7e9fd;
-  }
-  .table-responsive-vertical .table-hover.table-mc-blue > tbody > tr:hover > td,
-  .table-responsive-vertical .table-hover.table-mc-blue > tbody > tr:hover {
-    background-color: #fff;
-  }
-  .table-responsive-vertical .table-hover.table-mc-blue > tbody > tr > td:hover {
-    background-color: #d0d9ff;
-  }
-}
-.wkKalender-striped.table-mc-light-blue > tbody > tr:nth-child(odd) > td,
-.wkKalender-striped.table-mc-light-blue > tbody > tr:nth-child(odd) > th {
-  background-color: #e1f5fe;
-}
-.wkKalender-hover.table-mc-light-blue > tbody > tr:hover > td,
-.wkKalender-hover.table-mc-light-blue > tbody > tr:hover > th {
-  background-color: #b3e5fc;
-}
-@media screen and (max-width: 767px) {
-  .table-responsive-vertical .table-striped.table-mc-light-blue > tbody > tr > td,
-  .table-responsive-vertical .table-striped.table-mc-light-blue > tbody > tr:nth-child(odd) {
-    background-color: #fff;
-  }
-  .table-responsive-vertical .table-striped.table-mc-light-blue > tbody > tr > td:nth-child(odd) {
-    background-color: #e1f5fe;
-  }
-  .table-responsive-vertical .table-hover.table-mc-light-blue > tbody > tr:hover > td,
-  .table-responsive-vertical .table-hover.table-mc-light-blue > tbody > tr:hover {
-    background-color: #fff;
-  }
-  .table-responsive-vertical .table-hover.table-mc-light-blue > tbody > tr > td:hover {
-    background-color: #b3e5fc;
-  }
-}
-.wkKalender-striped.table-mc-cyan > tbody > tr:nth-child(odd) > td,
-.wkKalender-striped.table-mc-cyan > tbody > tr:nth-child(odd) > th {
-  background-color: #e0f7fa;
-}
-.wkKalender-hover.table-mc-cyan > tbody > tr:hover > td,
-.wkKalender-hover.table-mc-cyan > tbody > tr:hover > th {
-  background-color: #b2ebf2;
-}
-@media screen and (max-width: 767px) {
-  .table-responsive-vertical .table-striped.table-mc-cyan > tbody > tr > td,
-  .table-responsive-vertical .table-striped.table-mc-cyan > tbody > tr:nth-child(odd) {
-    background-color: #fff;
-  }
-  .table-responsive-vertical .table-striped.table-mc-cyan > tbody > tr > td:nth-child(odd) {
-    background-color: #e0f7fa;
-  }
-  .table-responsive-vertical .table-hover.table-mc-cyan > tbody > tr:hover > td,
-  .table-responsive-vertical .table-hover.table-mc-cyan > tbody > tr:hover {
-    background-color: #fff;
-  }
-  .table-responsive-vertical .table-hover.table-mc-cyan > tbody > tr > td:hover {
-    background-color: #b2ebf2;
-  }
-}
-.wkKalender-striped.table-mc-teal > tbody > tr:nth-child(odd) > td,
-.wkKalender-striped.table-mc-teal > tbody > tr:nth-child(odd) > th {
-  background-color: #e0f2f1;
-}
-.wkKalender-hover.table-mc-teal > tbody > tr:hover > td,
-.wkKalender-hover.table-mc-teal > tbody > tr:hover > th {
-  background-color: #b2dfdb;
-}
-@media screen and (max-width: 767px) {
-  .table-responsive-vertical .table-striped.table-mc-teal > tbody > tr > td,
-  .table-responsive-vertical .table-striped.table-mc-teal > tbody > tr:nth-child(odd) {
-    background-color: #fff;
-  }
-  .table-responsive-vertical .table-striped.table-mc-teal > tbody > tr > td:nth-child(odd) {
-    background-color: #e0f2f1;
-  }
-  .table-responsive-vertical .table-hover.table-mc-teal > tbody > tr:hover > td,
-  .table-responsive-vertical .table-hover.table-mc-teal > tbody > tr:hover {
-    background-color: #fff;
-  }
-  .table-responsive-vertical .table-hover.table-mc-teal > tbody > tr > td:hover {
-    background-color: #b2dfdb;
-  }
-}
-.wkKalender-striped.table-mc-green > tbody > tr:nth-child(odd) > td,
-.wkKalender-striped.table-mc-green > tbody > tr:nth-child(odd) > th {
-  background-color: #d0f8ce;
-}
-.wkKalender-hover.table-mc-green > tbody > tr:hover > td,
-.wkKalender-hover.table-mc-green > tbody > tr:hover > th {
-  background-color: #a3e9a4;
-}
-@media screen and (max-width: 767px) {
-  .table-responsive-vertical .table-striped.table-mc-green > tbody > tr > td,
-  .table-responsive-vertical .table-striped.table-mc-green > tbody > tr:nth-child(odd) {
-    background-color: #fff;
-  }
-  .table-responsive-vertical .table-striped.table-mc-green > tbody > tr > td:nth-child(odd) {
-    background-color: #d0f8ce;
-  }
-  .table-responsive-vertical .table-hover.table-mc-green > tbody > tr:hover > td,
-  .table-responsive-vertical .table-hover.table-mc-green > tbody > tr:hover {
-    background-color: #fff;
-  }
-  .table-responsive-vertical .table-hover.table-mc-green > tbody > tr > td:hover {
-    background-color: #a3e9a4;
-  }
-}
-.wkKalender-striped.table-mc-light-green > tbody > tr:nth-child(odd) > td,
-.wkKalender-striped.table-mc-light-green > tbody > tr:nth-child(odd) > th {
-  background-color: #f1f8e9;
-}
-.wkKalender-hover.table-mc-light-green > tbody > tr:hover > td,
-.wkKalender-hover.table-mc-light-green > tbody > tr:hover > th {
-  background-color: #dcedc8;
-}
-@media screen and (max-width: 767px) {
-  .table-responsive-vertical .table-striped.table-mc-light-green > tbody > tr > td,
-  .table-responsive-vertical .table-striped.table-mc-light-green > tbody > tr:nth-child(odd) {
-    background-color: #fff;
-  }
-  .table-responsive-vertical .table-striped.table-mc-light-green > tbody > tr > td:nth-child(odd) {
-    background-color: #f1f8e9;
-  }
-  .table-responsive-vertical .table-hover.table-mc-light-green > tbody > tr:hover > td,
-  .table-responsive-vertical .table-hover.table-mc-light-green > tbody > tr:hover {
-    background-color: #fff;
-  }
-  .table-responsive-vertical .table-hover.table-mc-light-green > tbody > tr > td:hover {
-    background-color: #dcedc8;
-  }
-}
-.wkKalender-striped.table-mc-lime > tbody > tr:nth-child(odd) > td,
-.wkKalender-striped.table-mc-lime > tbody > tr:nth-child(odd) > th {
-  background-color: #f9fbe7;
-}
-.wkKalender-hover.table-mc-lime > tbody > tr:hover > td,
-.wkKalender-hover.table-mc-lime > tbody > tr:hover > th {
-  background-color: #f0f4c3;
-}
-@media screen and (max-width: 767px) {
-  .table-responsive-vertical .table-striped.table-mc-lime > tbody > tr > td,
-  .table-responsive-vertical .table-striped.table-mc-lime > tbody > tr:nth-child(odd) {
-    background-color: #fff;
-  }
-  .table-responsive-vertical .table-striped.table-mc-lime > tbody > tr > td:nth-child(odd) {
-    background-color: #f9fbe7;
-  }
-  .table-responsive-vertical .table-hover.table-mc-lime > tbody > tr:hover > td,
-  .table-responsive-vertical .table-hover.table-mc-lime > tbody > tr:hover {
-    background-color: #fff;
-  }
-  .table-responsive-vertical .table-hover.table-mc-lime > tbody > tr > td:hover {
-    background-color: #f0f4c3;
-  }
-}
-.wkKalender-striped.table-mc-yellow > tbody > tr:nth-child(odd) > td,
-.wkKalender-striped.table-mc-yellow > tbody > tr:nth-child(odd) > th {
-  background-color: #fffde7;
-}
-.wkKalender-hover.table-mc-yellow > tbody > tr:hover > td,
-.wkKalender-hover.table-mc-yellow > tbody > tr:hover > th {
-  background-color: #fff9c4;
-}
-@media screen and (max-width: 767px) {
-  .table-responsive-vertical .table-striped.table-mc-yellow > tbody > tr > td,
-  .table-responsive-vertical .table-striped.table-mc-yellow > tbody > tr:nth-child(odd) {
-    background-color: #fff;
-  }
-  .table-responsive-vertical .table-striped.table-mc-yellow > tbody > tr > td:nth-child(odd) {
-    background-color: #fffde7;
-  }
-  .table-responsive-vertical .table-hover.table-mc-yellow > tbody > tr:hover > td,
-  .table-responsive-vertical .table-hover.table-mc-yellow > tbody > tr:hover {
-    background-color: #fff;
-  }
-  .table-responsive-vertical .table-hover.table-mc-yellow > tbody > tr > td:hover {
-    background-color: #fff9c4;
-  }
-}
-.wkKalender-striped.table-mc-amber > tbody > tr:nth-child(odd) > td,
-.wkKalender-striped.table-mc-amber > tbody > tr:nth-child(odd) > th {
-  background-color: #fff8e1;
-}
-.wkKalender-hover.table-mc-amber > tbody > tr:hover > td,
-.wkKalender-hover.table-mc-amber > tbody > tr:hover > th {
-  background-color: #ffecb3;
-}
-@media screen and (max-width: 767px) {
-  .table-responsive-vertical .table-striped.table-mc-amber > tbody > tr > td,
-  .table-responsive-vertical .table-striped.table-mc-amber > tbody > tr:nth-child(odd) {
-    background-color: #fff;
-  }
-  .table-responsive-vertical .table-striped.table-mc-amber > tbody > tr > td:nth-child(odd) {
-    background-color: #fff8e1;
-  }
-  .table-responsive-vertical .table-hover.table-mc-amber > tbody > tr:hover > td,
-  .table-responsive-vertical .table-hover.table-mc-amber > tbody > tr:hover {
-    background-color: #fff;
-  }
-  .table-responsive-vertical .table-hover.table-mc-amber > tbody > tr > td:hover {
-    background-color: #ffecb3;
-  }
-}
-.wkKalender-striped.table-mc-orange > tbody > tr:nth-child(odd) > td,
-.wkKalender-striped.table-mc-orange > tbody > tr:nth-child(odd) > th {
-  background-color: #fff3e0;
-}
-.wkKalender-hover.table-mc-orange > tbody > tr:hover > td,
-.wkKalender-hover.table-mc-orange > tbody > tr:hover > th {
-  background-color: #ffe0b2;
-}
-@media screen and (max-width: 767px) {
-  .table-responsive-vertical .table-striped.table-mc-orange > tbody > tr > td,
-  .table-responsive-vertical .table-striped.table-mc-orange > tbody > tr:nth-child(odd) {
-    background-color: #fff;
-  }
-  .table-responsive-vertical .table-striped.table-mc-orange > tbody > tr > td:nth-child(odd) {
-    background-color: #fff3e0;
-  }
-  .table-responsive-vertical .table-hover.table-mc-orange > tbody > tr:hover > td,
-  .table-responsive-vertical .table-hover.table-mc-orange > tbody > tr:hover {
-    background-color: #fff;
-  }
-  .table-responsive-vertical .table-hover.table-mc-orange > tbody > tr > td:hover {
-    background-color: #ffe0b2;
-  }
-}
-.wkKalender-striped.table-mc-deep-orange > tbody > tr:nth-child(odd) > td,
-.wkKalender-striped.table-mc-deep-orange > tbody > tr:nth-child(odd) > th {
-  background-color: #fbe9e7;
-}
-.wkKalender-hover.table-mc-deep-orange > tbody > tr:hover > td,
-.wkKalender-hover.table-mc-deep-orange > tbody > tr:hover > th {
-  background-color: #ffccbc;
-}
-@media screen and (max-width: 767px) {
-  .table-responsive-vertical .table-striped.table-mc-deep-orange > tbody > tr > td,
-  .table-responsive-vertical .table-striped.table-mc-deep-orange > tbody > tr:nth-child(odd) {
-    background-color: #fff;
-  }
-  .table-responsive-vertical .table-striped.table-mc-deep-orange > tbody > tr > td:nth-child(odd) {
-    background-color: #fbe9e7;
-  }
-  .table-responsive-vertical .table-hover.table-mc-deep-orange > tbody > tr:hover > td,
-  .table-responsive-vertical .table-hover.table-mc-deep-orange > tbody > tr:hover {
-    background-color: #fff;
-  }
-  .table-responsive-vertical .table-hover.table-mc-deep-orange > tbody > tr > td:hover {
-    background-color: #ffccbc;
-  }
-}
-*/*/
diff --git a/homepage/wkParticipo/infoZettel.php b/homepage/wkParticipo/infoZettel.php
index a310801..777443e 100644
--- a/homepage/wkParticipo/infoZettel.php
+++ b/homepage/wkParticipo/infoZettel.php
@@ -24,7 +24,7 @@
 		<meta name="viewport" content="width=device-width, initial-scale=1.0" />
 		
 		<title>Infozettel der Judoka des CWSV</title>
-		<meta name="description" content="Onlineversion der Handzettel für die Judoka des Chemnitzer WSV">
+		<meta name="description" content="Onlineversion der Handzettel f&uuml;r die Judoka des Chemnitzer WSV">
 		
 		<link rel="icon" href="/ressourcen/graphiken/icons/cwsv.ico" />
 		<link rel="apple-touch-icon" href="/apple-touch-icon.png">
diff --git a/infoZettelOrg/2019-02-27-Kyuprüfung2019.md b/infoZettelOrg/2019-02-27-Kyupruefung2019.md
similarity index 100%
rename from infoZettelOrg/2019-02-27-Kyuprüfung2019.md
rename to infoZettelOrg/2019-02-27-Kyupruefung2019.md
diff --git a/infoZettelOrg/2021-10-05-Stiefelpokal.md b/infoZettelOrg/2021-10-05-Stiefelpokal.md
new file mode 100644
index 0000000..95e90d4
--- /dev/null
+++ b/infoZettelOrg/2021-10-05-Stiefelpokal.md
@@ -0,0 +1,31 @@
+# 10.Stiefelpokal der Stadt Döbeln
+
+## Wettkampfdaten
+
+- Altersklassen: U11, U13
+- Datum: 09.10.2021
+- Ort: Stadtsporthalle DöbelnStraße des Friedens 9/ Gymnasium Döbeln 04720 Döbeln
+- Kontrollwiegen: 9:15 Uhr
+- Wettkampferöffnung: ca. 10:00 Uhr
+
+
+## Treffpunkt
+
+- Ort: P+R Parkplatz Südring/Stollberger Straße
+- Abfahrt: 7:45 Uhr
+- Kindersitz (falls nötig) nicht vergessen!
+
+## Nicht vergessen
+
+- *Testnachweis aus der Schule und vom Testzentrum*
+- Judopass
+- Judogi (d. h. Jacke, Hose und Gürtel)
+- *Hallenschuhe* (Auch die Fans!)
+- Essen/Trinken
+- Warme Socken und Pullover
+
+Das Betreten der Sportstätten in Straßenschuhen ist (auch den Fans) 
+nicht gestattet. Bitte Ersatzschuhe (Badelatschen/Hallenschuhe) 
+mitbringen. Sonst muss in Socken gegangen werden!
+
+MsG marko
diff --git a/infoZettelOrg/coronaZeit/coronaNewsletterReceiverEmails.txt b/infoZettelOrg/coronaZeit/coronaNewsletterReceiverEmails.txt
index b489d8a..905d763 100644
--- a/infoZettelOrg/coronaZeit/coronaNewsletterReceiverEmails.txt
+++ b/infoZettelOrg/coronaZeit/coronaNewsletterReceiverEmails.txt
@@ -1,16 +1,31 @@
+<<<<<<< HEAD:infoZettelOrg/coronaZeit/coronaNewsletterReceiverEmails.txt
 churicnate@yahoo.com
 <<<<<<< Updated upstream:infoZettelOrg/coronaZeit/coronaNewsletterReceiverEmails.txt
+=======
+akf21182@aol.com
+>>>>>>> coronaZeit:infoZettelOrg/coronaZeit/newsletterReceiverEmails.txt
 alled82@gmx.de
+churicnate@yahoo.com
+dani17184@web.de
 j.felke@gmx.net
+<<<<<<< HEAD:infoZettelOrg/coronaZeit/coronaNewsletterReceiverEmails.txt
 akf21182@aol.com
 norman.haeuberer@gmail.com
 =======
 dani17184@web.de
 >>>>>>> Stashed changes:infoZettelOrg/coronaZeit/newsletterReceiverEmails.txt
+=======
+>>>>>>> coronaZeit:infoZettelOrg/coronaZeit/newsletterReceiverEmails.txt
 julia.haeuberer@gmx.de
-dani17184@web.de
+mail@blankfuchs.de
+manja.bunzel@gmx.de
+meier.andrej@web.de
 mohamad.zahra1986@gmail.com
+nick.weidensager@web.de
+norman.haeuberer@gmail.com
+oks.dietrich@gmail.com
 post@was7.de
+reuf@gmx.net
 stephanie.brittnacher@gmail.com
 cwsvjudo@arcor.de
 marko.bunzel@arcor.de
diff --git a/infoZettelOrg/coronaZeit/mdNewsletter.d/2021-12-22.md b/infoZettelOrg/coronaZeit/mdNewsletter.d/2021-12-22.md
index de6e14f..e122d43 100644
--- a/infoZettelOrg/coronaZeit/mdNewsletter.d/2021-12-22.md
+++ b/infoZettelOrg/coronaZeit/mdNewsletter.d/2021-12-22.md
@@ -1,22 +1,39 @@
 ---
-title: cwsvJudo-Newsletter 2022-01-09
+title: cwsvJudo-Newsletter 2021-12-22
 ---
 
 Hallo liebe Eltern,
 Hallo liebe Judoka!
 
-## Jahresmarken, Kyumarken und Passbestellungen 2022
+## Training zwischen den Jahren
 
-Wie bereits im letzten Jahr erwähnt, werden dieses Jahr wieder die neuen Jahresmarken fällig. Bzw. auch der neue Pass (wer noch keinen hat) und die Marke für den nächsten Kyu. Deshalb bis zum 28.01.2022 mitbringen:
+Zwischen den Feiertagen wird es - wie angekündigt - am 29.12.2021 noch einmal ein kleines Spiele-Training geben:
 
-- für die Jahresmarke: 25,00 €
-- für die Prüfungsmarke: 12,00 €
-- für den Pass: 9,00 € 
-  - Nur für die, die noch keinen Pass haben.
-  - In den Pass kommt ein Passbild. Das benötige ich in digitaler Form (als Datei per Email, muss kein biometrisches Bild sein, ein einfaches Foto vom Gesicht reicht)
-  - Und für die Pass-Neubestellungen benötige ich die Zusatz-Angaben: Name, Vorname, Geburtsort, Nationalität
+- Datum: 29.12.2021
+- Zeit: 16:00--19:00 Uhr
+- Um eine [Einschreibung im Planer][1] wird gebeten
 
-Der Judopass dokumentiert die Mitgliedschaft des Judoka im [DJB][1]. Damit der Judoka an (offiziellen) Wettkämpfen und Gürtelprüfungen teilnehnmen kann, muss dieser jedes Jahr mit einer Jahresmarke und für jede Gürtelprüfung mit einer Kyumarke ausgestattet werden.
+Das nächste reguläre Training findet dann erst im nächsten Jahr am Mittwoch, den 05.01.2022, geben:
 
+- Datum: 05.01.2022
+- Zeit: 16:00--18:45 Uhr
 
-[1]: https://www.judobund.de
\ No newline at end of file
+Danach geht das Training zu den gewohnten Zeiten weiter:
+
+- Mittwoch:
+    Kinder/Jugend: 16:00–17:45 Uhr
+- Freitag:
+    - Kinder/Anfänger: 16:00–17:30 Uhr
+    - Jugend/Fortgeschrittene: 17:15--19:15 Uhr
+
+Damit die trainingsfreie Zeit nicht zu lanweilig wird, erinnere ich nocheinmal an unsere 12-Nächte-Challenge in [unserem Achievementsystem][2].
+
+Zum Abschluss wünsche ich allen Judokas und ihren Familien und Freunden Gesundheit , eine schöne Weihnacht und einen guten Rutsch ins neue Jahr.
+
+![](http://cwsvjudo.bplaced.net/weihnachtspyramide2021.jpg)
+
+Mit weihnachtlichen Grüßen
+marko
+
+[1]: http://cwsvjudo.bplaced.net/pages/desktop/wkParticipo/showWkEvent.php?eventId=139
+[2]: http://cwsvjudo.bplaced.net/machs
diff --git a/infoZettelOrg/coronaZeit/newsletterReceiverEmails.txt b/infoZettelOrg/coronaZeit/newsletterReceiverEmails.txt
index b489d8a..4afb0d9 100644
--- a/infoZettelOrg/coronaZeit/newsletterReceiverEmails.txt
+++ b/infoZettelOrg/coronaZeit/newsletterReceiverEmails.txt
@@ -1,16 +1,19 @@
-churicnate@yahoo.com
-<<<<<<< Updated upstream:infoZettelOrg/coronaZeit/coronaNewsletterReceiverEmails.txt
-alled82@gmx.de
-j.felke@gmx.net
 akf21182@aol.com
-norman.haeuberer@gmail.com
-=======
+alled82@gmx.de
+churicnate@yahoo.com
+alled82@gmx.de
+churicnate@yahoo.com
 dani17184@web.de
->>>>>>> Stashed changes:infoZettelOrg/coronaZeit/newsletterReceiverEmails.txt
 julia.haeuberer@gmx.de
-dani17184@web.de
+mail@blankfuchs.de
+manja.bunzel@gmx.de
+meier.andrej@web.de
 mohamad.zahra1986@gmail.com
+nick.weidensager@web.de
+norman.haeuberer@gmail.com
+oks.dietrich@gmail.com
 post@was7.de
+reuf@gmx.net
 stephanie.brittnacher@gmail.com
 cwsvjudo@arcor.de
 marko.bunzel@arcor.de
diff --git a/infoZettelOrg/coronaZeit/tools/sendMail.py b/infoZettelOrg/coronaZeit/tools/sendMail.py
index 9e61877..276e3be 100755
--- a/infoZettelOrg/coronaZeit/tools/sendMail.py
+++ b/infoZettelOrg/coronaZeit/tools/sendMail.py
@@ -9,6 +9,7 @@ import json
 import argparse
 import yaml
 from datetime import datetime
+import certifi
 
 def get_yaml(f):
 	'''Extracts the yamlHeader from a Markdown file'''
@@ -87,6 +88,9 @@ if __name__=="__main__":
 
 	# Create a secure SSL context
 	context = ssl.create_default_context()
+	# @todo This is a very bad hack, because the cert checking doesn't wor anymore
+	context.check_hostname = False
+	context.verify_mode = ssl.CERT_NONE
 	with smtplib.SMTP_SSL(config['smtp']['serverAddress'], config['smtp']['serverPort'], context=context) as server:
 		server.login(config['smtp']['login'], config['smtp']['password'])
 		for receiverEmail in receiverEmails:
diff --git a/infoZettelOrg/cwsvJudoZettel.sty b/infoZettelOrg/cwsvJudoZettel.sty
index 7a8e1d5..b10fa08 100644
--- a/infoZettelOrg/cwsvJudoZettel.sty
+++ b/infoZettelOrg/cwsvJudoZettel.sty
@@ -51,7 +51,7 @@
 % Kopf- und Fußzeilen
 \usepackage{scrlayer-scrpage}
 % Inhalte der Kopf-und Fußzeile
-	\lohead{\today}
+	% \lohead{\today}
 	% anscheinend wird durch includegraphics ein Rand hinzugefügt, sodass die Graphik höher wird
 	% Korrektur bei Schriftgröße
 		% 10pt: -3.60004pt
diff --git a/kyu/cwsvKyuPrüfung2021/cwsvKyuMeldeliste2021.ods b/kyu/cwsvKyuPrüfung2021/cwsvKyuMeldeliste2021.ods
new file mode 100644
index 0000000..3d17674
Binary files /dev/null and b/kyu/cwsvKyuPrüfung2021/cwsvKyuMeldeliste2021.ods differ
diff --git a/kyu/falttafeln/kyu-4-A.png b/kyu/falttafeln/kyu-4-A.png
new file mode 100644
index 0000000..e8b713a
Binary files /dev/null and b/kyu/falttafeln/kyu-4-A.png differ
diff --git a/kyu/falttafeln/kyu-4-B.png b/kyu/falttafeln/kyu-4-B.png
new file mode 100644
index 0000000..0de68f5
Binary files /dev/null and b/kyu/falttafeln/kyu-4-B.png differ
diff --git a/kyu/falttafeln/kyu-5-A.png b/kyu/falttafeln/kyu-5-A.png
new file mode 100644
index 0000000..714954e
Binary files /dev/null and b/kyu/falttafeln/kyu-5-A.png differ
diff --git a/kyu/falttafeln/kyu-5-B.png b/kyu/falttafeln/kyu-5-B.png
new file mode 100644
index 0000000..d884910
Binary files /dev/null and b/kyu/falttafeln/kyu-5-B.png differ
diff --git a/kyu/falttafeln/kyu-6-A.png b/kyu/falttafeln/kyu-6-A.png
new file mode 100644
index 0000000..86aa47f
Binary files /dev/null and b/kyu/falttafeln/kyu-6-A.png differ
diff --git a/kyu/falttafeln/kyu-6-B.png b/kyu/falttafeln/kyu-6-B.png
new file mode 100644
index 0000000..e708c95
Binary files /dev/null and b/kyu/falttafeln/kyu-6-B.png differ
diff --git a/kyu/falttafeln/kyu-7-A.png b/kyu/falttafeln/kyu-7-A.png
new file mode 100644
index 0000000..f91744b
Binary files /dev/null and b/kyu/falttafeln/kyu-7-A.png differ
diff --git a/kyu/falttafeln/kyu-7-B.png b/kyu/falttafeln/kyu-7-B.png
new file mode 100644
index 0000000..6e6a6e9
Binary files /dev/null and b/kyu/falttafeln/kyu-7-B.png differ
diff --git a/kyu/falttafeln/kyu-8-A.png b/kyu/falttafeln/kyu-8-A.png
new file mode 100644
index 0000000..8f40eed
Binary files /dev/null and b/kyu/falttafeln/kyu-8-A.png differ
diff --git a/kyu/falttafeln/kyu-8-B.png b/kyu/falttafeln/kyu-8-B.png
new file mode 100644
index 0000000..6096822
Binary files /dev/null and b/kyu/falttafeln/kyu-8-B.png differ
diff --git a/kyu/falttafeln/make.sh b/kyu/falttafeln/make.sh
new file mode 100755
index 0000000..346b8aa
--- /dev/null
+++ b/kyu/falttafeln/make.sh
@@ -0,0 +1,5 @@
+for i in {8,7,6,5,4}; do \
+	convert kyu-$i-A.png kyu-$i-B.png kyu-$i.pdf;\
+	pdfjam --nup 1x2 kyu-$i.pdf '1,1,2,2' --outfile kyu-$i-a4druck.pdf;\
+done;
+
diff --git a/lexikon/horstWolfToMd/Makefile.GoKyu b/lexikon/horstWolfToMd/Makefile.GoKyu
index 50857b0..abb8abc 100644
--- a/lexikon/horstWolfToMd/Makefile.GoKyu
+++ b/lexikon/horstWolfToMd/Makefile.GoKyu
@@ -17,114 +17,114 @@ daiNikyo: OUchiGari KoUchiGari KoshiGuruma TsuriKomiGoshi OkuriAshiBarei TaiOtos
 .PHONY: DeAshiBarai
 DeAshiBarai:
 	pdftoppm -f 39 -l 40 ressource/wolf_horst_judo_kampfsport_1968.pdf DeAshiBarai
-	tesseract -l deu DeAshiBarai-39.ppm DeAshiBarai-39 -psm 1
-	tesseract -l deu DeAshiBarai-40.ppm DeAshiBarai-40 -psm 1
-#	tesseract --tessdata-dir $(tessdataDir) -l deu DeAshiBarai-39.ppm DeAshiBarai-39 -psm 1
-#	tesseract --tessdata-dir $(tessdataDir) -l deu DeAshiBarai-40.ppm DeAshiBarai-40 -psm 1
+	tesseract -l deu DeAshiBarai-39.ppm DeAshiBarai-39 --psm 1
+	tesseract -l deu DeAshiBarai-40.ppm DeAshiBarai-40 --psm 1
+#	tesseract --tessdata-dir $(tessdataDir) -l deu DeAshiBarai-39.ppm DeAshiBarai-39 --psm 1
+#	tesseract --tessdata-dir $(tessdataDir) -l deu DeAshiBarai-40.ppm DeAshiBarai-40 --psm 1
 
 .PHONY: HizaGuruma
 HizaGuruma:
 	pdftoppm -f 40 -l 41 ressource/wolf_horst_judo_kampfsport_1968.pdf HizaGuruma
-	tesseract -l deu HizaGuruma-40.ppm HizaGuruma-40 -psm 1
-	tesseract -l deu HizaGuruma-41.ppm HizaGuruma-41 -psm 1
+	tesseract -l deu HizaGuruma-40.ppm HizaGuruma-40 --psm 1
+	tesseract -l deu HizaGuruma-41.ppm HizaGuruma-41 --psm 1
 	cat HizaGuruma-{40,41}.txt > HizaGuruma.txt
 
 .PHONY: SasaeTsuriKomiAshi
 SasaeTsuriKomiAshi:
 	pdftoppm -f 41 -l 42 ressource/wolf_horst_judo_kampfsport_1968.pdf SasaeTsuriKomiAshi
-	tesseract -l deu SasaeTsuriKomiAshi-41.ppm SasaeTsuriKomiAshi-41 -psm 1
-	tesseract -l deu SasaeTsuriKomiAshi-42.ppm SasaeTsuriKomiAshi-42 -psm 1
+	tesseract -l deu SasaeTsuriKomiAshi-41.ppm SasaeTsuriKomiAshi-41 --psm 1
+	tesseract -l deu SasaeTsuriKomiAshi-42.ppm SasaeTsuriKomiAshi-42 --psm 1
 	cat SasaeTsuriKomiAshi-{41,42}.txt > SasaeTsuriKomiAshi.txt
 
 .PHONY: UkiGoshi
 UkiGoshi:
 	pdftoppm -f 42 -l 44 ressource/wolf_horst_judo_kampfsport_1968.pdf UkiGoshi
-	tesseract -l deu UkiGoshi-42.ppm UkiGoshi-42 -psm 1
-	tesseract -l deu UkiGoshi-43.ppm UkiGoshi-43 -psm 1
-	tesseract -l deu UkiGoshi-44.ppm UkiGoshi-44 -psm 1
+	tesseract -l deu UkiGoshi-42.ppm UkiGoshi-42 --psm 1
+	tesseract -l deu UkiGoshi-43.ppm UkiGoshi-43 --psm 1
+	tesseract -l deu UkiGoshi-44.ppm UkiGoshi-44 --psm 1
 	cat UkiGoshi-{42,43,44}.txt > UkiGoshi.txt
 
 .PHONY: OSotoGari
 OSotoGari:
 	pdftoppm -f 44 -l 45 ressource/wolf_horst_judo_kampfsport_1968.pdf OSotoGari
-	tesseract -l deu OSotoGari-44.ppm OSotoGari-44 -psm 1
-	tesseract -l deu OSotoGari-45.ppm OSotoGari-45 -psm 1
+	tesseract -l deu OSotoGari-44.ppm OSotoGari-44 --psm 1
+	tesseract -l deu OSotoGari-45.ppm OSotoGari-45 --psm 1
 	cat OSotoGari-{44,45}.txt > OSotoGari.txt
 
 .PHONY: OGoshi
 OGoshi:
 	pdftoppm -f 45 -l 46 ressource/wolf_horst_judo_kampfsport_1968.pdf OGoshi
-	tesseract -l deu OGoshi-45.ppm OGoshi-45 -psm 1
-	tesseract -l deu OGoshi-46.ppm OGoshi-46 -psm 1
+	tesseract -l deu OGoshi-45.ppm OGoshi-45 --psm 1
+	tesseract -l deu OGoshi-46.ppm OGoshi-46 --psm 1
 	cat OGoshi-{45,46}.txt > OGoshi.txt
 
 .PHONY: KoSotoGari
 KoSotoGari:
 	pdftoppm -f 46 -l 47 ressource/wolf_horst_judo_kampfsport_1968.pdf KoSotoGari
-	tesseract -l deu KoSotoGari-46.ppm KoSotoGari-46 -psm 1
-	tesseract -l deu KoSotoGari-47.ppm KoSotoGari-47 -psm 1
+	tesseract -l deu KoSotoGari-46.ppm KoSotoGari-46 --psm 1
+	tesseract -l deu KoSotoGari-47.ppm KoSotoGari-47 --psm 1
 	cat KoSotoGari-{46,47}.txt > KoSotoGari.txt
 
 .PHONY: SeoiNage
 SeoiNage:
 	pdftoppm -f 47 -l 48 ressource/wolf_horst_judo_kampfsport_1968.pdf SeoiNage
-	tesseract -l deu SeoiNage-47.ppm SeoiNage-47 -psm 1
-	tesseract -l deu SeoiNage-48.ppm SeoiNage-48 -psm 1
+	tesseract -l deu SeoiNage-47.ppm SeoiNage-47 --psm 1
+	tesseract -l deu SeoiNage-48.ppm SeoiNage-48 --psm 1
 	cat SeoiNage-{47,48}.txt > SeoiNage.txt
 
 .PHONY: OUchiGari
 OUchiGari:
 	pdftoppm -f 49 -l 50 ressource/wolf_horst_judo_kampfsport_1968.pdf OUchiGari
-	tesseract -l deu OUchiGari-49.ppm OUchiGari-49 -psm 1
-	tesseract -l deu OUchiGari-50.ppm OUchiGari-50 -psm 1
+	tesseract -l deu OUchiGari-49.ppm OUchiGari-49 --psm 1
+	tesseract -l deu OUchiGari-50.ppm OUchiGari-50 --psm 1
 	cat OUchiGari-{49,50}.txt > OUchiGari.txt
 
 .PHONY: KoUchiGari
 KoUchiGari:
 	pdftoppm -f 50 -l 52 ressource/wolf_horst_judo_kampfsport_1968.pdf KoUchiGari
-	tesseract -l deu KoUchiGari-50.ppm KoUchiGari-50 -psm 1
-	tesseract -l deu KoUchiGari-51.ppm KoUchiGari-51 -psm 1
-	tesseract -l deu KoUchiGari-52.ppm KoUchiGari-52 -psm 1
+	tesseract -l deu KoUchiGari-50.ppm KoUchiGari-50 --psm 1
+	tesseract -l deu KoUchiGari-51.ppm KoUchiGari-51 --psm 1
+	tesseract -l deu KoUchiGari-52.ppm KoUchiGari-52 --psm 1
 	cat KoUchiGari-{50,51,52}.txt > KoUchiGari.txt
 
 .PHONY: KoshiGuruma
 KoshiGuruma:
 	pdftoppm -f 52 -l 53 ressource/wolf_horst_judo_kampfsport_1968.pdf KoshiGuruma
-	tesseract -l deu KoshiGuruma-52.ppm KoshiGuruma-52 -psm 1
-	tesseract -l deu KoshiGuruma-53.ppm KoshiGuruma-53 -psm 1
+	tesseract -l deu KoshiGuruma-52.ppm KoshiGuruma-52 --psm 1
+	tesseract -l deu KoshiGuruma-53.ppm KoshiGuruma-53 --psm 1
 	cat KoshiGuruma-{52,53}.txt > KoshiGuruma.txt
 
 .PHONY: TsuriKomiGoshi
 TsuriKomiGoshi:
 	pdftoppm -f 53 -l 54 ressource/wolf_horst_judo_kampfsport_1968.pdf TsuriKomiGoshi
-	tesseract -l deu TsuriKomiGoshi-53.ppm TsuriKomiGoshi-53 -psm 1
-	tesseract -l deu TsuriKomiGoshi-54.ppm TsuriKomiGoshi-54 -psm 1
+	tesseract -l deu TsuriKomiGoshi-53.ppm TsuriKomiGoshi-53 --psm 1
+	tesseract -l deu TsuriKomiGoshi-54.ppm TsuriKomiGoshi-54 --psm 1
 	cat TsuriKomiGoshi-{53,54}.txt > TsuriKomiGoshi.txt
 
 .PHONY: OkuriAshiBarei
 OkuriAshiBarei:
 	pdftoppm -f 54 -l 55 ressource/wolf_horst_judo_kampfsport_1968.pdf OkuriAshiBarei
-	tesseract -l deu OkuriAshiBarei-54.ppm OkuriAshiBarei-54 -psm 1
-	tesseract -l deu OkuriAshiBarei-55.ppm OkuriAshiBarei-55 -psm 1
+	tesseract -l deu OkuriAshiBarei-54.ppm OkuriAshiBarei-54 --psm 1
+	tesseract -l deu OkuriAshiBarei-55.ppm OkuriAshiBarei-55 --psm 1
 	cat OkuriAshiBarei-{54,55}.txt > OkuriAshiBarei.txt
 
 .PHONY: TaiOtoshi
 TaiOtoshi:
 	pdftoppm -f 55 -l 56 ressource/wolf_horst_judo_kampfsport_1968.pdf TaiOtoshi
-	tesseract -l deu TaiOtoshi-55.ppm TaiOtoshi-55 -psm 1
-	tesseract -l deu TaiOtoshi-56.ppm TaiOtoshi-56 -psm 1
+	tesseract -l deu TaiOtoshi-55.ppm TaiOtoshi-55 --psm 1
+	tesseract -l deu TaiOtoshi-56.ppm TaiOtoshi-56 --psm 1
 	cat TaiOtoshi-{55,56}.txt > TaiOtoshi.txt
 
 .PHONY: HaraiGoshi
 HaraiGoshi:
 	pdftoppm -f 56 -l 57 ressource/wolf_horst_judo_kampfsport_1968.pdf HaraiGoshi
-	tesseract -l deu HaraiGoshi-56.ppm HaraiGoshi-56 -psm 1
-	tesseract -l deu HaraiGoshi-57.ppm HaraiGoshi-57 -psm 1
+	tesseract -l deu HaraiGoshi-56.ppm HaraiGoshi-56 --psm 1
+	tesseract -l deu HaraiGoshi-57.ppm HaraiGoshi-57 --psm 1
 	cat HaraiGoshi-{56,57}.txt > HaraiGoshi.txt
 
 .PHONY: UchiMata
 UchiMata:
 	pdftoppm -f 57 -l 58 ressource/wolf_horst_judo_kampfsport_1968.pdf UchiMata
-	tesseract -l deu UchiMata-57.ppm UchiMata-57 -psm 1
-	tesseract -l deu UchiMata-58.ppm UchiMata-58 -psm 1
+	tesseract -l deu UchiMata-57.ppm UchiMata-57 --psm 1
+	tesseract -l deu UchiMata-58.ppm UchiMata-58 --psm 1
 	cat UchiMata-{57,58}.txt > UchiMata.txt
diff --git a/org/ÜL-Abrechnungsbogen-2021-02.ods b/org/ÜL-Abrechnungsbogen-2021-02.ods
new file mode 100644
index 0000000..198552e
Binary files /dev/null and b/org/ÜL-Abrechnungsbogen-2021-02.ods differ
diff --git a/org/ÜL-Abrechnungsbogen-2021-02.pdf b/org/ÜL-Abrechnungsbogen-2021-02.pdf
new file mode 100644
index 0000000..4a80f52
Binary files /dev/null and b/org/ÜL-Abrechnungsbogen-2021-02.pdf differ
diff --git a/sportabzeichen/dsa.2021/pruefkarten/Gruppenpruefkarte-2021-form.pdf b/sportabzeichen/dsa.2021/pruefkarten/Gruppenpruefkarte-2021-form.pdf
new file mode 100644
index 0000000..383c984
Binary files /dev/null and b/sportabzeichen/dsa.2021/pruefkarten/Gruppenpruefkarte-2021-form.pdf differ
diff --git a/sportabzeichen/dsa.2021/pruefkarten/Gruppenpruefkarte-2021-unterschrieben.pdf b/sportabzeichen/dsa.2021/pruefkarten/Gruppenpruefkarte-2021-unterschrieben.pdf
new file mode 100644
index 0000000..b280ccb
Binary files /dev/null and b/sportabzeichen/dsa.2021/pruefkarten/Gruppenpruefkarte-2021-unterschrieben.pdf differ
diff --git a/sportabzeichen/dsa.2021/pruefkarten/Gruppenpruefkarte-CWSV-Judo.pdf b/sportabzeichen/dsa.2021/pruefkarten/Gruppenpruefkarte-CWSV-Judo.pdf
new file mode 100644
index 0000000..3bfb886
Binary files /dev/null and b/sportabzeichen/dsa.2021/pruefkarten/Gruppenpruefkarte-CWSV-Judo.pdf differ
diff --git a/sportabzeichen/dsa.2021/schwimmnachweise/DSA_Schwimmnachweis_2021_beschreibbar.pdf b/sportabzeichen/dsa.2021/schwimmnachweise/DSA_Schwimmnachweis_2021_beschreibbar.pdf
new file mode 100644
index 0000000..7d29d28
Binary files /dev/null and b/sportabzeichen/dsa.2021/schwimmnachweise/DSA_Schwimmnachweis_2021_beschreibbar.pdf differ
diff --git a/sportabzeichen/dsa.2021/schwimmnachweise/FelkeEmely.pdf b/sportabzeichen/dsa.2021/schwimmnachweise/FelkeEmely.pdf
new file mode 100644
index 0000000..d214e5b
Binary files /dev/null and b/sportabzeichen/dsa.2021/schwimmnachweise/FelkeEmely.pdf differ
diff --git a/sportabzeichen/dsa.2021/schwimmnachweise/MarkoBunzel.pdf b/sportabzeichen/dsa.2021/schwimmnachweise/MarkoBunzel.pdf
new file mode 100644
index 0000000..d256ec9
Binary files /dev/null and b/sportabzeichen/dsa.2021/schwimmnachweise/MarkoBunzel.pdf differ
diff --git a/sportabzeichen/dsa.2021/schwimmnachweise/NicoLoebling.pdf b/sportabzeichen/dsa.2021/schwimmnachweise/NicoLoebling.pdf
new file mode 100644
index 0000000..faca62a
Binary files /dev/null and b/sportabzeichen/dsa.2021/schwimmnachweise/NicoLoebling.pdf differ
diff --git a/sportabzeichen/dsa.2021/schwimmnachweise/RioGraf.pdf b/sportabzeichen/dsa.2021/schwimmnachweise/RioGraf.pdf
new file mode 100644
index 0000000..bac0b7a
Binary files /dev/null and b/sportabzeichen/dsa.2021/schwimmnachweise/RioGraf.pdf differ
diff --git a/sportabzeichen/dsa.2021/schwimmnachweise/RomyBrittnacher.pdf b/sportabzeichen/dsa.2021/schwimmnachweise/RomyBrittnacher.pdf
new file mode 100644
index 0000000..67d678d
Binary files /dev/null and b/sportabzeichen/dsa.2021/schwimmnachweise/RomyBrittnacher.pdf differ
diff --git a/sportabzeichen/trainingskarten/2021-07-18.md b/sportabzeichen/dsa.2021/trainingskarten/2021-07-18.md
similarity index 100%
rename from sportabzeichen/trainingskarten/2021-07-18.md
rename to sportabzeichen/dsa.2021/trainingskarten/2021-07-18.md
diff --git a/sportabzeichen/trainingskarten/DSA_Trainingsplaner_beschreibbar.pdf b/sportabzeichen/dsa.2021/trainingskarten/DSA_Trainingsplaner_beschreibbar.pdf
similarity index 100%
rename from sportabzeichen/trainingskarten/DSA_Trainingsplaner_beschreibbar.pdf
rename to sportabzeichen/dsa.2021/trainingskarten/DSA_Trainingsplaner_beschreibbar.pdf
diff --git a/sportabzeichen/trainingskarten/dsaTrainingsplaner-2021-mnl-10+11.pdf b/sportabzeichen/dsa.2021/trainingskarten/dsaTrainingsplaner-2021-mnl-10+11.pdf
similarity index 100%
rename from sportabzeichen/trainingskarten/dsaTrainingsplaner-2021-mnl-10+11.pdf
rename to sportabzeichen/dsa.2021/trainingskarten/dsaTrainingsplaner-2021-mnl-10+11.pdf
diff --git a/sportabzeichen/trainingskarten/dsaTrainingsplaner-2021-mnl-14+15.pdf b/sportabzeichen/dsa.2021/trainingskarten/dsaTrainingsplaner-2021-mnl-14+15.pdf
similarity index 100%
rename from sportabzeichen/trainingskarten/dsaTrainingsplaner-2021-mnl-14+15.pdf
rename to sportabzeichen/dsa.2021/trainingskarten/dsaTrainingsplaner-2021-mnl-14+15.pdf
diff --git a/sportabzeichen/trainingskarten/dsaTrainingsplaner-2021-wbl-10+11.pdf b/sportabzeichen/dsa.2021/trainingskarten/dsaTrainingsplaner-2021-wbl-10+11.pdf
similarity index 100%
rename from sportabzeichen/trainingskarten/dsaTrainingsplaner-2021-wbl-10+11.pdf
rename to sportabzeichen/dsa.2021/trainingskarten/dsaTrainingsplaner-2021-wbl-10+11.pdf
diff --git a/sportabzeichen/trainingskarten/dsaTrainingsplaner-2021-wbl-6+7.pdf b/sportabzeichen/dsa.2021/trainingskarten/dsaTrainingsplaner-2021-wbl-6+7.pdf
similarity index 100%
rename from sportabzeichen/trainingskarten/dsaTrainingsplaner-2021-wbl-6+7.pdf
rename to sportabzeichen/dsa.2021/trainingskarten/dsaTrainingsplaner-2021-wbl-6+7.pdf
diff --git a/sportabzeichen/trainingskarten/dsaTrainingsplaner-2021-wbl-8+9.pdf b/sportabzeichen/dsa.2021/trainingskarten/dsaTrainingsplaner-2021-wbl-8+9.pdf
similarity index 100%
rename from sportabzeichen/trainingskarten/dsaTrainingsplaner-2021-wbl-8+9.pdf
rename to sportabzeichen/dsa.2021/trainingskarten/dsaTrainingsplaner-2021-wbl-8+9.pdf
diff --git a/sportabzeichen/trainingskarten/personalisiert/dominicFriedrich.pdf b/sportabzeichen/dsa.2021/trainingskarten/personalisiert/dominicFriedrich.pdf
similarity index 100%
rename from sportabzeichen/trainingskarten/personalisiert/dominicFriedrich.pdf
rename to sportabzeichen/dsa.2021/trainingskarten/personalisiert/dominicFriedrich.pdf
diff --git a/sportabzeichen/trainingskarten/personalisiert/emelyFelke.pdf b/sportabzeichen/dsa.2021/trainingskarten/personalisiert/emelyFelke.pdf
similarity index 100%
rename from sportabzeichen/trainingskarten/personalisiert/emelyFelke.pdf
rename to sportabzeichen/dsa.2021/trainingskarten/personalisiert/emelyFelke.pdf
diff --git a/sportabzeichen/trainingskarten/personalisiert/janneHaeuberer.pdf b/sportabzeichen/dsa.2021/trainingskarten/personalisiert/janneHaeuberer.pdf
similarity index 100%
rename from sportabzeichen/trainingskarten/personalisiert/janneHaeuberer.pdf
rename to sportabzeichen/dsa.2021/trainingskarten/personalisiert/janneHaeuberer.pdf
diff --git a/sportabzeichen/trainingskarten/personalisiert/miaSophieFriedrich.pdf b/sportabzeichen/dsa.2021/trainingskarten/personalisiert/miaSophieFriedrich.pdf
similarity index 100%
rename from sportabzeichen/trainingskarten/personalisiert/miaSophieFriedrich.pdf
rename to sportabzeichen/dsa.2021/trainingskarten/personalisiert/miaSophieFriedrich.pdf
diff --git a/sportabzeichen/trainingskarten/personalisiert/nicoLoebling.pdf b/sportabzeichen/dsa.2021/trainingskarten/personalisiert/nicoLoebling.pdf
similarity index 100%
rename from sportabzeichen/trainingskarten/personalisiert/nicoLoebling.pdf
rename to sportabzeichen/dsa.2021/trainingskarten/personalisiert/nicoLoebling.pdf
diff --git a/sportabzeichen/trainingskarten/personalisiert/rioGraf.pdf b/sportabzeichen/dsa.2021/trainingskarten/personalisiert/rioGraf.pdf
similarity index 100%
rename from sportabzeichen/trainingskarten/personalisiert/rioGraf.pdf
rename to sportabzeichen/dsa.2021/trainingskarten/personalisiert/rioGraf.pdf
diff --git a/sportabzeichen/trainingskarten/personalisiert/romyBrittnacher.pdf b/sportabzeichen/dsa.2021/trainingskarten/personalisiert/romyBrittnacher.pdf
similarity index 100%
rename from sportabzeichen/trainingskarten/personalisiert/romyBrittnacher.pdf
rename to sportabzeichen/dsa.2021/trainingskarten/personalisiert/romyBrittnacher.pdf
diff --git a/sportabzeichen/trainingskarten/personalisiert/sebastianFriedrich.pdf b/sportabzeichen/dsa.2021/trainingskarten/personalisiert/sebastianFriedrich.pdf
similarity index 100%
rename from sportabzeichen/trainingskarten/personalisiert/sebastianFriedrich.pdf
rename to sportabzeichen/dsa.2021/trainingskarten/personalisiert/sebastianFriedrich.pdf
diff --git a/sportabzeichen/pruefkarten/BrittnacherRomy.pdf b/sportabzeichen/pruefkarten/BrittnacherRomy.pdf
deleted file mode 100644
index e765ef2..0000000
Binary files a/sportabzeichen/pruefkarten/BrittnacherRomy.pdf and /dev/null differ
diff --git a/sportabzeichen/pruefkarten/DSA_Einzelpruefkarte_2021_beschreibbar.pdf b/sportabzeichen/pruefkarten/DSA_Einzelpruefkarte_2021_beschreibbar.pdf
deleted file mode 100644
index 8e17db8..0000000
Binary files a/sportabzeichen/pruefkarten/DSA_Einzelpruefkarte_2021_beschreibbar.pdf and /dev/null differ
diff --git a/sportabzeichen/pruefkarten/FelkeEmely.pdf b/sportabzeichen/pruefkarten/FelkeEmely.pdf
deleted file mode 100644
index b5d87d2..0000000
Binary files a/sportabzeichen/pruefkarten/FelkeEmely.pdf and /dev/null differ
diff --git a/sportabzeichen/pruefkarten/GrafRio.pdf b/sportabzeichen/pruefkarten/GrafRio.pdf
deleted file mode 100644
index ca0f31f..0000000
Binary files a/sportabzeichen/pruefkarten/GrafRio.pdf and /dev/null differ
diff --git a/sportabzeichen/pruefkarten/LoeblingNico.pdf b/sportabzeichen/pruefkarten/LoeblingNico.pdf
deleted file mode 100644
index dbd079a..0000000
Binary files a/sportabzeichen/pruefkarten/LoeblingNico.pdf and /dev/null differ
diff --git a/sportabzeichen/pruefkarten/MarkoBunzel.pdf b/sportabzeichen/pruefkarten/MarkoBunzel.pdf
deleted file mode 100644
index 9baa1a9..0000000
Binary files a/sportabzeichen/pruefkarten/MarkoBunzel.pdf and /dev/null differ
diff --git a/submodules/Makefile b/submodules/Makefile
new file mode 100644
index 0000000..aacb1cc
--- /dev/null
+++ b/submodules/Makefile
@@ -0,0 +1,10 @@
+.PHONY: updateSubmodules
+updateSubmodules:
+	git -C lite-youtube-embed checkout master
+	git -C materialize checkout main
+	git -C parsedown checkout master
+	git -C spyc checkout master
+	git -C zopfli checkout master
+
+	git submodule foreach git pull
+
diff --git a/submodules/lite-youtube-embed b/submodules/lite-youtube-embed
new file mode 160000
index 0000000..79f21ea
--- /dev/null
+++ b/submodules/lite-youtube-embed
@@ -0,0 +1 @@
+Subproject commit 79f21eafa44c52eea39ee0d47e186cbd380fa72b
diff --git a/submodules/materialize b/submodules/materialize
new file mode 160000
index 0000000..6f9dd06
--- /dev/null
+++ b/submodules/materialize
@@ -0,0 +1 @@
+Subproject commit 6f9dd06c09685ce20423984b2e65ba97d2aaf79c
diff --git a/submodules/parsedown b/submodules/parsedown
new file mode 160000
index 0000000..6598f38
--- /dev/null
+++ b/submodules/parsedown
@@ -0,0 +1 @@
+Subproject commit 6598f3860c2698fe2f0f1bc98212fc01d0a1893c
diff --git a/submodules/spyc b/submodules/spyc
new file mode 160000
index 0000000..daf9fa4
--- /dev/null
+++ b/submodules/spyc
@@ -0,0 +1 @@
+Subproject commit daf9fa4ef675519386b4f556c9d5ab5f9c14055a
diff --git a/submodules/zopfli b/submodules/zopfli
new file mode 160000
index 0000000..831773b
--- /dev/null
+++ b/submodules/zopfli
@@ -0,0 +1 @@
+Subproject commit 831773bc28e318b91a3255fa12c9fcde1606058b