diff --git a/startpage/main.html b/startpage/main.html
index 3e590fa..f479933 100644
--- a/startpage/main.html
+++ b/startpage/main.html
@@ -1,141 +1,3 @@
-<<<<<<< Updated upstream
-<html>
-	<head>
-		<title>main</title>
-		<style type="text/css">
-			body {background: #001;font-family: 'Hack', sans-serif;font-style: normal;color:#00a492;margin: 0px;}
-
-			/*.keepcentered {position: relative;center: 100%;top: 30%;width: 25%;height: 5%;margin-left: 30%; margin-top: 5%;font-weight: 100;}*/
-			.keepcentered{position: absolute; top: 10%; left: 10%; right: 10%}
-
-			td, tr {width: 25%;text-align: left; font-size: 30px}
-
-			a {font-family: 'Hack', sans-serif;font-weight: 100;color : #999;}
-			a:hover{color: #eee;}
-			a:link {text-decoration : none;text-shadow: 0px 0px 0px #000;}
-
-			#titles {font-size: 40px;color:}
-			#time {font-size: 70px;color:}
-
-			.event {width: 155px;height:130px;float:left;border: 1px solid #4d6774;padding: 0px 5px;}
-			.event h5 {font-size:13px;padding: 8px 3px;margin:3px 0;color:#756f7b;}
-			.event p {font-family: 'Roboto', sans-serif;font-weight: 100;color : #999;font-size: 13px;}
-		</style>
-	</head>
-
-	<body onload="updateClock();">
-		<div class="keepcentered">
-			<center><div id="time"></div></center>
-			<p>
-				<center>
-					<table width ="100%" border="0px">
-						<tr>
-							<td id="titles">Faves</td>
-							<td id="titles">Google</td>
-							<td id="titles">Coding</td>
-							<td id="titles">News</td>
-						</tr>
-						<tr>
-							<td><!-- --></td>
-							<td><a href="http://www.gmail.com">gMail</a></td>
-							<td><a href="http://programarcadegames.com/">Pygame</a></td>
-							<td><a href="http://www.faz.net">Faz</a></td>
-						</tr>
-						<tr>
-							<td><a href="http://www.youtube.com/feed/subscriptions">YouTube</a></td>
-							<td><a href="http://drive.google.com">gDrive</a></td>
-							<td><a href="https://developer.mozilla.org/en-US/docs/Web/JavaScript">JS</a></td>
-							<td><a href="http://www.golem.de">golem</td>
-													</tr>
-						<tr>
-							<td><a href="http://www.reddit.com/r/unixporn">r/unixporn</a></td>
-							<td><a href="https://www.google.com/calendar/">gCal</a></td>
-							<td><a href="http://www.cplusplus.com/reference/">C++</a></td>
-							<td><a href="http://news.ycombinator.com">HN</a></td>
-
-						</tr>
-						<tr>
-							<td><a href="http://www.reddit.com/r/linux">r/linux</a></td>
-							<td><a href="http://www.keep.google.com">gKeep</td>
-							<td><a href="https://msdn.microsoft.com/de-de/library/618ayhy6.aspx">C#</a></td>
-							<td><a href="http://www.heise.de">heise</a></td>
-							</tr>
-						<tr>
-							<td><a href="http://reddit.com/r/mechanicalkeyboards">r/MK</a></td>
-							<td><!-- --></td>
-							<td><a href="https://github.com/">Github</a></td>
-							<td><a href="http://theregister.co.uk">Register</a></td>
-						</tr>
-						<tr>
-							<td><!-- --></td>
-							<td><!-- --></td>
-							<td><a href="http://trello.com">Trello</a></td>
-							<td><a href="http://www.facebook.com">Facebook</a></td>
-						</tr>
-					</table>
-				</center>
-			</p>
-			<p>
-				<center>
-					<table width="100%" border="0px">
-						<tr>
-							<td id="titles">Work</td>
-							<td id="titles">Hobbies</td>
-							<td id="titles">Communication</td>
-						</tr>
-						<tr>
-							<td><a href="http://hvgese010:8081/tfs/_rooms#_a=today&name=Raum+Docusuite-Team&collectionName=VS2015">DS Chat</a></td>
-							<td><a></a></td>
-							<td><a href="https://web.whatsapp.com/">WhatsApp</a></td>
-						</tr>
-						<tr>
-								<td><a href="http://hvgese010:8081/tfs/VS2015/Docusuite/_dashboards">DS Dash</td>
-								<td><a></a></td>
-								<td><a href="https://discordapp.com/channels/@me">discord</a></td>
-
-							</tr>
-							<tr>
-								<td><a href="http://hvgese010:8081/tfs/VS2015/smartdocusuite/_dashboards">smartDS Dash</td>
-								<td></td>
-								<td><a href="http://127.0.0.1:8384">syncthing</td>
-
-
-							</tr>
-							<tr>
-								<td><a href="https://mese.webuntis.com/WebUntis/index.do;jsessionid=05330733B40F3C0F68FE76AC9BA06BD9#main">nixdorf_bk_essen</a></td>
-							</tr>
-					</table>
-				</center>
-			</p>
-		</div>
-	</body>
-
-
-	<script type="text/javascript" src="//ajax.googleapis.com/ajax/libs/jquery/1.10.2/jquery.min.js"></script>
-	<script>
-		/*
-		Update the clock on a regular interval
-		*/
-		function updateClock() {
-			Date.getMinutesTwoDigits = function()
-			{
-				var retval = now.getMinutes();
-				if (retval < 10) return ("0" + retval.toString());
-				else return retval.toString();
-			}
-			Date.getHoursModTwelve = function()
-			{
-				return now.getHours();
-			}
-			var ampm;
-			var now = new Date(),
-			time = Date.getHoursModTwelve() + ':' + Date.getMinutesTwoDigits();
-			document.getElementById('time').innerHTML = ["", time].join('');
-			setTimeout(updateClock, 1000);
-		}
-		</script>
-</html>
-=======
 <html>
 	<head>
 		<title>main</title>
@@ -272,4 +134,3 @@
 		}
 		</script>
 </html>
->>>>>>> Stashed changes

Faves	Google	Coding	News
	gMail	Pygame	Faz
YouTube	gDrive	JS	golem
r/unixporn	gCal	C++	HN
r/linux	gKeep	C#	heise
r/MK		Github	Register
		Trello	Facebook
Work	Hobbies	Communication
DS Chat		WhatsApp
DS Dash		discord
smartDS Dash		syncthing
nixdorf_bk_essen