merge

startpage/main.html

@@ -35,7 +35,7 @@
 							<td id="titles">News</td>
 						</tr>
 						<tr>
-							<td><!-- --></td>
+							<td><a href="https://de.todoist.com/app">Todoist</a></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>
@@ -49,14 +49,13 @@
 						<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="https://msdn.microsoft.com/de-de/library/618ayhy6.aspx">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="https://gist.github.com/">GistHub</a></td>
 							<td><a href="http://www.heise.de">heise</a></td>
 							</tr>
 						<tr>
@@ -84,7 +83,7 @@
 						</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://chaospott.de/status.html">Door Status</td>
 							<td><a href="https://web.whatsapp.com/">WhatsApp</a></td>
 						</tr>
 						<tr>