diff --git a/_templates/impressum.htm b/_templates/impressum.htm
index ff87b93..54ba4b4 100644
--- a/_templates/impressum.htm
+++ b/_templates/impressum.htm
@@ -7,7 +7,7 @@
 		<h4>Zuständige Vereinsbehörde</h4><p>BH Baden</p>
 		<h4>ZVR-Zahl</h4><p>1062104322</p>
 		<h4>Sitz &amp; Adresse</h4><p>Hauptstraße 26<br />2544 Leobersdorf</p>
-		<h4>Vorstand</h4><p>Obmann: Peter Ludikovsky<br />Kassier: Stefan Dastig<br />Schriftführer: Tomasz Kijas</p>
+		<h4>Vorstand</h4><p>Obmann: Peter Ludikovsky<br />Kassier: Stefan Dastig<br />Schriftführer: Martin Baumgartner</p>
 		<h4>Administrativer Kontakt</h4><p><a href="mailto:kernel@usrspace.at">kernel@usrspace.at</a></p>
 		<h4>Cookies &amp; Datenschutz</h4>
 			<p><a href="datenschutz.php">Datenschutzerklärung</a></p>
diff --git a/_templates/index.htm b/_templates/index.htm
index 2008471..1a6bf03 100644
--- a/_templates/index.htm
+++ b/_templates/index.htm
@@ -18,7 +18,7 @@
 				<span class="icon fa-wrench"></span>
 				<div class="content">
 					<h3>Repair Café</h3>
-					<p>Am Samstag den 9. November 2019, veranstalten wir wieder ein Repair-Café, diesmal in Zusammenarbeit mit der Marktgemeinde Kottingbrunn. Alle Details dazu findest du im <a href="https://www.usrspace.at/wiki/Repair-Caf%C3%A9">Wiki</a>.</p>
+					<p>Alle Termine sind zur Zeit wegen der aktuellen Situation durch <strong>COVID-19</strong> ausgesetzt.</p>
 				</div>
 			</article>
 			<article>
@@ -52,6 +52,7 @@
 				<span class="icon fa-calendar"></span>
 				<div class="content">
 					<h3>Termine</h3>
+					<p><strong>ACHTUNG!</strong> Durch die aktuelle Situation mit <strong>COVID-19</strong> sind alle Termine ausgesetzt. Manche Termine im Kalender sind von anderen Veranstaltern, bitte Informieren Sie sich direkt dort nach der Gültigkeit.</p>
 					<p>Aktuelle Termine und Veranstaltungen findest du links im <a href="https://usrspace.at/termine">Kalender</a> oder im <a href="https://usrspace.at/wiki/">Wiki</a>.</p>
 				</div>
 			</article>
diff --git a/_templates/main.htm b/_templates/main.htm
index 41a21a2..d24491c 100644
--- a/_templates/main.htm
+++ b/_templates/main.htm
@@ -46,7 +46,7 @@
 						<div class="inner">
 
 							<!-- Header -->
-								<header id="header" style="padding-top: 6em">
+								<header id="header">
 									<a href="/" class="logo"><strong>/usr/space</strong> - Makerspace in Leobersdorf</a>
 									<ul class="icons">
 										<li><a href="https://matrix.to/#/#usrspace:matrix.usrspace.at" class="icon fa-hashtag" target="_blank"><span class="label">Matrix</span></a></li>
@@ -76,12 +76,6 @@
 			<script src="assets/js/util.js"></script>
 			<!--[if lte IE 8]><script src="assets/js/ie/respond.min.js"></script><![endif]-->
 			<script src="assets/js/main.js"></script>
-			<script>
-				$.get("calendar.php?o=sidebar")
-					.done(function(data) {
-						$("#cal_content").html(data);
-				});
-			</script>
 			<@Scripts@>
 	</body>
 </html>
diff --git a/_templates/sidebar.htm b/_templates/sidebar.htm
index 496ad2b..43d31b5 100644
--- a/_templates/sidebar.htm
+++ b/_templates/sidebar.htm
@@ -4,40 +4,14 @@
 			<h2>Menu</h2>
 		</header>
 		<ul>
-			<li><a href="https://usrspace.at/index.php">Start</a></li>
-			<li><a href="https://usrspace.at/stammtisch.php">Stammtisch</a></li>				
-			<li><a href="https://usrspace.at/mitgliedschaft.php">Mitgliedschaft</a></li>					
-			<li><a href="https://usrspace.at/w/index.php">Wiki</a></li>					
-			<li><a href="https://gitlab.usrspace.at/explore/projects">Gitlab</a></li>				
+			<li><a href="https://www.usrspace.at/index.php">Start</a></li>
+			<li><a href="https://www.usrspace.at/stammtisch.php">Stammtisch</a></li>				
+			<li><a href="https://www.usrspace.at/mitgliedschaft.php">Mitgliedschaft</a></li>					
+			<li><a href="https://wiki.usrspace.at">Wiki</a></li>					
+			<li><a href="https://gitea.usrspace.at/explore/repos">Gitea</a></li>		
 		</ul>
 	</nav>
 
-<!-- Section -->
-	<section>
-		<header class="major">
-			<h2>nächste Termine</h2>
-		</header>
-		<div class="mini-posts">
-			<div id="cal"> 
-				<h4 class="align-center"><@CalendarRange@></h4>
-				<table id="days" class="calendar"> 
-					<thead><tr>
-						<th>Mo</th> 
-						<th>Di</th> 
-						<th>Mi</th> 
-						<th>Do</th> 
-						<th>Fr</th> 
-						<th>Sa</th> 
-						<th>So</th>
-					</tr></thead>
-					<tbody id="cal_content"> 
-						<@CalendarContent@>
-					</tbody> 
-				</table> 
-			</div>
-		</div>
-	</section>
-
 <!-- Section -->
 	<section>
 		<header class="major">
@@ -48,19 +22,20 @@
 			<li class="fa-twitter"><a href="https://www.twitter.com/usrspace_at" target="_blank">@usrspace_at</a></li>
 			<li class="fa-facebook"><a href="https://www.facebook.com/usrspace.at" target="_blank">facebook.com/usrspace.at</a></li>
 			<li class="fa-hashtag"><a href="https://matrix.to/#/#usrspace:matrix.usrspace.at" target="_blank">#usrspace:matrix.usrspace.at</a></li>
-			<li class="fa-users"><a href="https://usrspace.at/stammtisch.php">Stammtisch</a></li>
+			<li class="fa-users"><a href="https://www.usrspace.at/stammtisch.php">Stammtisch</a></li>
 		</ul>
 	</section>
 
 <!-- Footer -->
 	<footer id="footer">
 		<p class="copyright">
-			Icons: <a href="http://fontawesome.io" target="_blank">Fontawesome</a><br />
-			Design: <a href="https://html5up.net" target="_blank">HTML5 UP</a>
+			Icons: <a href="https://fontawesome.com/v4.7.0/license" target="_blank">Fontawesome</a><br />
+			Fonts: <a href="https://github.com/googlefonts/robotoslab/blob/master/LICENSE.txt" target="_blank">Roboto Slab</a>, <a href="https://github.com/googlefonts/opensans/blob/master/LICENSE.txt" target="_blank">Open Sans</a><br />
+			Design: <a href="https://html5up.net/license" target="_blank">HTML5 UP</a>
 		</p>
 		<p class="copyright">
-			<a href="https://usrspace.at/impressum.php">Impressum</a><br />
-			<a href="https://usrspace.at/datenschutz.php">Datenschutzerklärung</a>
+			<a href="https://www.usrspace.at/impressum.php">Impressum</a><br />
+			<a href="https://www.usrspace.at/datenschutz.php">Datenschutzerklärung</a>
 		</p>
 		<p class="copyright">&copy; /usr/space - <a href="https://creativecommons.org/licenses/by-sa/3.0/at/">CC BY-SA 3.0 AT</a></p>
 	</footer>
diff --git a/_templates/stammtisch.htm b/_templates/stammtisch.htm
index bcd3775..e73c38a 100644
--- a/_templates/stammtisch.htm
+++ b/_templates/stammtisch.htm
@@ -4,10 +4,10 @@
 			<div class="6u 12u$(small)">
 				<header class="major">
 					<h1>Stammtisch</h1>
-					<p>Der Stammtisch findet jede Woche, abwechselnd Mittwochs und Donnerstags, in unserem Space ab 19:00 statt.</p>
+					<p><strong>Der Stammtisch findet</strong> <strike>jede Woche, abwechselnd Mittwochs und Donnerstags, in unserem Space ab 19:00 statt.</strike> vorübergehend <strong>wegen</strong> der aktuellen Situation durch <strong>COVID-19 nicht statt.</strong></p>
 				</header>
 				<p>Der Stammtisch ist gedacht für alle Mitglieder sich regelmäßig zu treffen und/oder Interressierte in einer größeren Runde kennen zu lernen. Es darf &amp; soll über eigene und fremde Projekte, interessante Nachrichten, netzpolitische Themen, … diskutiert oder auch präsentiert werden.</p>
-				<blockquote>Der nächste Stammtisch findet am <strong><@NextStammtischDate@></strong> ab <strong>19:00</strong> Uhr, in der Mühlgasse 8 in 2544 Leobersdorf, statt.</blockquote>
+				<blockquote><strike>Der nächste Stammtisch findet am <strong><@NextStammtischDate@></strong> ab <strong>19:00</strong> Uhr, in der Mühlgasse 8 in 2544 Leobersdorf, statt.</strike></blockquote>
 			</div>
 			<div class="6u$ 12u$(small)">
 					<div id="stammMap"></div>
diff --git a/_templates/termine.htm b/_templates/termine.htm
new file mode 100644
index 0000000..e1856dd
--- /dev/null
+++ b/_templates/termine.htm
@@ -0,0 +1,31 @@
+<!-- Section -->
+<section>
+	<header class="major">
+		<h2>Termine</h2>
+		<p></p>
+	</header>
+	<p>Aufgrund der aktuellen Situation mit COVID-19 und sich den ständig ändernden Bedingungen <a href="https://wiki.usrspace.at/COVID-19">aktuelle Maßnahmen</a> </p>
+	<div class="row">
+		<div class="6u 12u$(medium)">
+			<header class="major">
+				<h3>Stammtisch</h3>
+			</header>
+			<p>Der Stammtisch ist gedacht für alle Mitglieder sich regelmäßig zu treffen und/oder Interressierte in einer größeren Runde kennen zu lernen. Es darf &amp; soll über eigene und fremde Projekte, interessante Nachrichten, netzpolitische Themen, … diskutiert oder auch präsentiert werden.</p>
+			<blockquote>Der nächste Stammtisch findet am <strong><@NextStammtischDate@></strong> ab <strong>19:00</strong> Uhr, in der Mühlgasse 8 in 2544 Leobersdorf, statt.</blockquote>
+		</div>
+		<div class="6u 12u$(medium)">
+			<header class="major">
+				<h3>Repair-Café</h3>
+			</header>
+			<p>Ein Repair-Café ist eine Veranstaltung, bei der sich Menschen, die defekte Geräte lieber reparieren als neu kaufen wollen, mit anderen Treffen, die bei der Reparatur helfen können. Dazu wird Werkzeug, gewisse Teile und Erfahrung kostenlos zur Verfügung gestellt. Wer nichts direkt zu reparieren hat kann sich dabei mit anderen bei Kaffee & Snacks austauschen.</p>
+			<blockquote>Den aktuellen Termin und weitere Infos findest du <a href="https://wiki.usrspace.at/wiki/Repair-Caf%C3%A9#.C3.9Cbersicht">hier</a> im Wiki.</blockquote>
+		</div>
+		<div class="4u 12u$(medium)">
+			<header class="major">
+				<h3>Kalender</h3>
+			</header>
+			<p>Alle weiteren Termine findest du in unserem <a href="https://usrspace.at/termine">Kalender</a></p>
+			<p><a href="https://usrspace.at/termine.ics" class="button icon fa-download">alle Termine als .ics download</a></p>
+		</div>
+	</div>
+</section>
diff --git a/assets/css/main.css b/assets/css/main.css
index d47e8b6..f8a96c2 100644
--- a/assets/css/main.css
+++ b/assets/css/main.css
@@ -1,5 +1,61 @@
 @import url(font-awesome.min.css);
-@import url("https://fonts.googleapis.com/css?family=Open+Sans:400,600,400italic,600italic|Roboto+Slab:400,700");
+/* @import url("https://fonts.googleapis.com/css?family=Open+Sans:400,600,400italic,600italic|Roboto+Slab:400,700"); */
+
+/* open-sans-regular - latin-ext_latin */
+@font-face {
+	font-family: 'Open Sans';
+	font-style: normal;
+	font-weight: 400;
+	src: local('Open Sans Regular'), local('OpenSans-Regular'),
+			url('../fonts/open-sans/open-sans-v17-latin-ext_latin-regular.woff2') format('woff2'), /* Chrome 26+, Opera 23+, Firefox 39+ */
+			url('../fonts/open-sans/open-sans-v17-latin-ext_latin-regular.woff') format('woff'); /* Chrome 6+, Firefox 3.6+, IE 9+, Safari 5.1+ */
+}
+/* open-sans-italic - latin-ext_latin */
+@font-face {
+	font-family: 'Open Sans';
+	font-style: italic;
+	font-weight: 400;
+	src: local('Open Sans Italic'), local('OpenSans-Italic'),
+			url('../fonts/open-sans/open-sans-v17-latin-ext_latin-italic.woff2') format('woff2'), /* Chrome 26+, Opera 23+, Firefox 39+ */
+			url('../fonts/open-sans/open-sans-v17-latin-ext_latin-italic.woff') format('woff'); /* Chrome 6+, Firefox 3.6+, IE 9+, Safari 5.1+ */
+}
+/* open-sans-600 - latin-ext_latin */
+@font-face {
+	font-family: 'Open Sans';
+	font-style: normal;
+	font-weight: 600;
+	src: local('Open Sans SemiBold'), local('OpenSans-SemiBold'),
+			url('../fonts/open-sans/open-sans-v17-latin-ext_latin-600.woff2') format('woff2'), /* Chrome 26+, Opera 23+, Firefox 39+ */
+			url('../fonts/open-sans/open-sans-v17-latin-ext_latin-600.woff') format('woff'); /* Chrome 6+, Firefox 3.6+, IE 9+, Safari 5.1+ */
+}
+/* open-sans-600italic - latin-ext_latin */
+@font-face {
+	font-family: 'Open Sans';
+	font-style: italic;
+	font-weight: 600;
+	src: local('Open Sans SemiBold Italic'), local('OpenSans-SemiBoldItalic'),
+			url('../fonts/open-sans/open-sans-v17-latin-ext_latin-600italic.woff2') format('woff2'), /* Chrome 26+, Opera 23+, Firefox 39+ */
+			url('../fonts/open-sans/open-sans-v17-latin-ext_latin-600italic.woff') format('woff'); /* Chrome 6+, Firefox 3.6+, IE 9+, Safari 5.1+ */
+}
+
+/* roboto-slab-regular - latin-ext_latin */
+@font-face {
+	font-family: 'Roboto Slab';
+	font-style: normal;
+	font-weight: 400;
+	src: local(''),
+			url('../fonts/roboto-slab/roboto-slab-v11-latin-ext_latin-regular.woff2') format('woff2'), /* Chrome 26+, Opera 23+, Firefox 39+ */
+			url('../fonts/roboto-slab/roboto-slab-v11-latin-ext_latin-regular.woff') format('woff'); /* Chrome 6+, Firefox 3.6+, IE 9+, Safari 5.1+ */
+}
+/* roboto-slab-700 - latin-ext_latin */
+@font-face {
+	font-family: 'Roboto Slab';
+	font-style: normal;
+	font-weight: 700;
+	src: local(''),
+			url('../fonts/roboto-slab/roboto-slab-v11-latin-ext_latin-700.woff2') format('woff2'), /* Chrome 26+, Opera 23+, Firefox 39+ */
+			url('../fonts/roboto-slab/roboto-slab-v11-latin-ext_latin-700.woff') format('woff'); /* Chrome 6+, Firefox 3.6+, IE 9+, Safari 5.1+ */
+}
 
 /*
 	Editorial by HTML5 UP
@@ -26,6 +82,10 @@
 		line-height: 1;
 	}
 
+	#header {
+		padding-top: 6em;
+	}
+
 	ol, ul {
 		list-style: none;
 	}
diff --git a/assets/fonts/open-sans/open-sans-v17-latin-ext_latin-600.woff b/assets/fonts/open-sans/open-sans-v17-latin-ext_latin-600.woff
new file mode 100644
index 0000000..adaf3a1
Binary files /dev/null and b/assets/fonts/open-sans/open-sans-v17-latin-ext_latin-600.woff differ
diff --git a/assets/fonts/open-sans/open-sans-v17-latin-ext_latin-600.woff2 b/assets/fonts/open-sans/open-sans-v17-latin-ext_latin-600.woff2
new file mode 100644
index 0000000..2444919
Binary files /dev/null and b/assets/fonts/open-sans/open-sans-v17-latin-ext_latin-600.woff2 differ
diff --git a/assets/fonts/open-sans/open-sans-v17-latin-ext_latin-600italic.woff b/assets/fonts/open-sans/open-sans-v17-latin-ext_latin-600italic.woff
new file mode 100644
index 0000000..39146ef
Binary files /dev/null and b/assets/fonts/open-sans/open-sans-v17-latin-ext_latin-600italic.woff differ
diff --git a/assets/fonts/open-sans/open-sans-v17-latin-ext_latin-600italic.woff2 b/assets/fonts/open-sans/open-sans-v17-latin-ext_latin-600italic.woff2
new file mode 100644
index 0000000..f08eedd
Binary files /dev/null and b/assets/fonts/open-sans/open-sans-v17-latin-ext_latin-600italic.woff2 differ
diff --git a/assets/fonts/open-sans/open-sans-v17-latin-ext_latin-italic.woff b/assets/fonts/open-sans/open-sans-v17-latin-ext_latin-italic.woff
new file mode 100644
index 0000000..edac093
Binary files /dev/null and b/assets/fonts/open-sans/open-sans-v17-latin-ext_latin-italic.woff differ
diff --git a/assets/fonts/open-sans/open-sans-v17-latin-ext_latin-italic.woff2 b/assets/fonts/open-sans/open-sans-v17-latin-ext_latin-italic.woff2
new file mode 100644
index 0000000..7584008
Binary files /dev/null and b/assets/fonts/open-sans/open-sans-v17-latin-ext_latin-italic.woff2 differ
diff --git a/assets/fonts/open-sans/open-sans-v17-latin-ext_latin-regular.woff b/assets/fonts/open-sans/open-sans-v17-latin-ext_latin-regular.woff
new file mode 100644
index 0000000..efb8f0d
Binary files /dev/null and b/assets/fonts/open-sans/open-sans-v17-latin-ext_latin-regular.woff differ
diff --git a/assets/fonts/open-sans/open-sans-v17-latin-ext_latin-regular.woff2 b/assets/fonts/open-sans/open-sans-v17-latin-ext_latin-regular.woff2
new file mode 100644
index 0000000..9b58220
Binary files /dev/null and b/assets/fonts/open-sans/open-sans-v17-latin-ext_latin-regular.woff2 differ
diff --git a/assets/fonts/roboto-slab/roboto-slab-v11-latin-ext_latin-700.woff b/assets/fonts/roboto-slab/roboto-slab-v11-latin-ext_latin-700.woff
new file mode 100644
index 0000000..3cba2c2
Binary files /dev/null and b/assets/fonts/roboto-slab/roboto-slab-v11-latin-ext_latin-700.woff differ
diff --git a/assets/fonts/roboto-slab/roboto-slab-v11-latin-ext_latin-700.woff2 b/assets/fonts/roboto-slab/roboto-slab-v11-latin-ext_latin-700.woff2
new file mode 100644
index 0000000..b693ac5
Binary files /dev/null and b/assets/fonts/roboto-slab/roboto-slab-v11-latin-ext_latin-700.woff2 differ
diff --git a/assets/fonts/roboto-slab/roboto-slab-v11-latin-ext_latin-regular.woff b/assets/fonts/roboto-slab/roboto-slab-v11-latin-ext_latin-regular.woff
new file mode 100644
index 0000000..7284e36
Binary files /dev/null and b/assets/fonts/roboto-slab/roboto-slab-v11-latin-ext_latin-regular.woff differ
diff --git a/assets/fonts/roboto-slab/roboto-slab-v11-latin-ext_latin-regular.woff2 b/assets/fonts/roboto-slab/roboto-slab-v11-latin-ext_latin-regular.woff2
new file mode 100644
index 0000000..e98ef63
Binary files /dev/null and b/assets/fonts/roboto-slab/roboto-slab-v11-latin-ext_latin-regular.woff2 differ
diff --git a/assets/js/main.js b/assets/js/main.js
index 8c36549..ae615b2 100644
--- a/assets/js/main.js
+++ b/assets/js/main.js
@@ -24,15 +24,6 @@
 
 		// Disable animations/transitions ...
 
-			// ... until the page has loaded.
-				$body.addClass('is-loading');
-
-				$window.on('load', function() {
-					setTimeout(function() {
-						$body.removeClass('is-loading');
-					}, 100);
-				});
-
 			// ... when resizing.
 				var resizeTimeout;
 
diff --git a/calendar.php b/calendar.php
index b39c807..0bc581e 100644
--- a/calendar.php
+++ b/calendar.php
@@ -7,7 +7,7 @@ require_once "common.php";
 use ICal\ICal;
 
 try {
-    $ical = new ICal('https://usrspace.at/termine.ics', array(
+    $ical = new ICal('https://www.usrspace.at/termine.ics', array(
         'defaultSpan'                 => 2,     // Default value
         'defaultTimeZone'             => 'UTC',
         'defaultWeekStart'            => 'MO',  // Default value
diff --git a/files/Folder_v3.2.pdf b/files/Folder_v3.2.pdf
new file mode 100644
index 0000000..478219f
Binary files /dev/null and b/files/Folder_v3.2.pdf differ
diff --git a/files/Mitgliedsantrag_v2.pdf b/files/Mitgliedsantrag_v2.pdf
new file mode 100644
index 0000000..f31250c
Binary files /dev/null and b/files/Mitgliedsantrag_v2.pdf differ
diff --git a/files/Mitgliedsantrag_v3.pdf b/files/Mitgliedsantrag_v3.pdf
new file mode 100644
index 0000000..b61ed20
Binary files /dev/null and b/files/Mitgliedsantrag_v3.pdf differ
diff --git a/files/Protokoll_Generalversammlung_20180126.pdf b/files/Protokoll_Generalversammlung_20180126.pdf
new file mode 100644
index 0000000..7dfa1ee
Binary files /dev/null and b/files/Protokoll_Generalversammlung_20180126.pdf differ
diff --git a/files/Statuten_20170502.pdf b/files/Statuten_20170502.pdf
new file mode 100644
index 0000000..2d08752
Binary files /dev/null and b/files/Statuten_20170502.pdf differ
diff --git a/files/Statuten_20180126.pdf b/files/Statuten_20180126.pdf
new file mode 100644
index 0000000..c731cd3
Binary files /dev/null and b/files/Statuten_20180126.pdf differ
diff --git a/files/coc_20171221.pdf b/files/coc_20171221.pdf
new file mode 100644
index 0000000..506868c
Binary files /dev/null and b/files/coc_20171221.pdf differ
diff --git a/files/infoblatt.pdf b/files/infoblatt.pdf
new file mode 100644
index 0000000..0803c5a
Binary files /dev/null and b/files/infoblatt.pdf differ
diff --git a/termine.php b/termine.php
new file mode 100644
index 0000000..88f1b09
--- /dev/null
+++ b/termine.php
@@ -0,0 +1,42 @@
+<?php
+
+require_once "common.php";
+
+$Content = get_template('/termine.htm');
+
+date_default_timezone_set('Europe/Vienna');
+
+$st_mi = mktime(22,50,50,3,14,2018);
+$st_do = mktime(22,50,50,3,22,2018);
+
+while ($st_mi < time()) {
+	$st_mi = $st_mi + (60 * 60 * 24 * 14); // +2 Wochen, ToDo: ich weis nicht ob das mit Schaltsekunden über die nächsten 1000 Jahre usw. auch funktioniert 
+}
+
+while ($st_do < time()) {
+	$st_do = $st_do + (60 * 60 * 24 * 14);
+}
+
+if ($st_mi < $st_do) {
+	$d = $st_mi;
+} else {
+	$d = $st_do;
+}
+
+$Content = str_replace('<@NextStammtischDate@>',date('d.m.Y',$d),$Content);
+
+$Styles = '<link rel="stylesheet" href="assets/css/leaflet.css" />';
+
+$Scripts = '<script src="assets/js/leaflet.js"></script>';
+$Scripts .= get_template ('/stammtisch_map.js');
+
+$template = get_template('/main.htm');
+$template = str_replace('<@Styles@>',$Styles,$template);
+$template = str_replace('<@Sidebar@>',get_template('/sidebar.htm'),$template);
+$template = str_replace('<@CalendarRange@>',gen_calendar_header(),$template);
+$template = str_replace('<@CalendarContent@>',gen_calendar_content(),$template);
+$template = str_replace('<@Content@>',$Content,$template);
+$template = str_replace('<@Scripts@>',$Scripts,$template);
+print_template($template);
+
+?>
\ No newline at end of file
diff --git a/uploades/ArduinoEinfuehrung31012018.pdf b/uploades/ArduinoEinfuehrung31012018.pdf
new file mode 100644
index 0000000..a387d52
Binary files /dev/null and b/uploades/ArduinoEinfuehrung31012018.pdf differ