X-Git-Url: https://git.martlubbers.net/?p=martlubbers.net.git;a=blobdiff_plain;f=index.html;fp=index.html;h=ad0b59ac86cfcda9b73a21cf8b4ba3f49065ebfc;hp=cfae4c497f43f8adf46d24595c6ea61a4212a0ce;hb=7479ecb32947d6982398b8ed4246ff79f3240ac0;hpb=348c39a8e5452c776761e6f10e45a7b54dcb18f3

diff --git a/index.html b/index.html
index cfae4c4..ad0b59a 100644
--- a/index.html
+++ b/index.html
@@ -146,12 +146,17 @@
 			</td></tr>
 		</table>
 
-		<h3>Teaching and talks</h3>
+		<h3>Teaching</h3>
 		<table>
 			<tr>
-				<th>Date/Files</th>
+				<th>Date</th>
 				<th>Description</th>
 			</tr>
+			<tr>
+				<td>2020/2021-Q1,Q2</td>
+				<td>New Device Lab (TBA)</td>
+				<td>NWI-IBC031 (<a href="https://ru.nl">RU</a>)</td>
+			</tr>
 			<tr>
 				<td>2019/2020-Q3,Q4</td>
 				<td>Compiler Construction (half of the lectures, orals)</td>
@@ -162,6 +167,34 @@
 				<td>Computers en Programmeren (support the practicals)</td>
 				<td>TCP1 (<a href="https://www.defensie.nl/onderwerpen/defensieacademie">NLDA</a>)</td>
 			</tr>
+			<tr>
+				<td>2018/2019-Q3,Q4</td>
+				<td>Compiler Construction (half of the lectures, all seminars, orals)</td>
+				<td>NWI-IMC004 (<a href="https://ru.nl">RU</a>)</td>
+			</tr>
+			<tr>
+				<td>2018/2019-Q1,Q2</td>
+				<td>Advanced Functional Programming (grading and half of the seminars).</td>
+				<td>NWI-I00032 (<a href="https://ru.nl">RU</a>)</td>
+			</tr>
+		</table>
+
+		<h3>Talks</h3>
+		<table>
+			<tr>
+				<th>Date/Files</th>
+				<th>Description</th>
+			</tr>
+			<tr>
+				<td>2020-10-06</td>
+				<td>Tiered versus Tierless IoT Stacks: Comparing Smart Campus Software Architectures</td>
+				<td><a href="https://iot-conference.org/iot2020/">IoT 2020</a></td>
+			</tr>
+			<tr>
+				<td>2020-09-02</td>
+				<td>Asynchronous Shared Data Sources</td>
+				<td><a href="https://www.cs.kent.ac.uk/events/2020/ifl20/">IFL 2020</a></td>
+			</tr>
 			<tr>
 				<td>2019-11-18</td>
 				<td>The fun of computing science: footballer brains in SoccerFun</td>
@@ -170,7 +203,7 @@
 			<tr>
 				<td>2019-09-25</td>
 				<td>Interpreting Task Oriented Programs on Tiny Computers</td>
-				<td><a href="http://2019.iflconference.org/">IFL19</a></td>
+				<td><a href="http://2019.iflconference.org/">IFL 2019</a></td>
 			</tr>
 			<tr>
 				<td>2019-07-03</td>
@@ -192,21 +225,11 @@
 				<td>Task Oriented Programming and the Internet of Things.</td>
 				<td><a href="https://conf.researchr.org/home/plnl-2018">PLNL18</a></td>
 			</tr>
-			<tr>
-				<td>2018/2019-Q3,Q4</td>
-				<td>Compiler Construction (half of the lectures, all seminars, orals)</td>
-				<td>NWI-IMC004 (<a href="https://ru.nl">RU</a>)</td>
-			</tr>
 			<tr>
 				<td>2018-11-29</td>
 				<td>Task Oriented Programming and the Internet of Things.</td>
 				<td><a href="https://conf.researchr.org/home/plnl-2018">PLNL18</a></td>
 			</tr>
-			<tr>
-				<td>2018/2019-Q1,Q2</td>
-				<td>Advanced Functional Programming (grading and half of the seminars).</td>
-				<td>NWI-I00032 (<a href="https://ru.nl">RU</a>)</td>
-			</tr>
 			<tr>
 				<td>2018-10-23,24,25</td>
 				<td>Three day teacher training on TOP and IOT for the 3COWS project.</td>
@@ -220,7 +243,7 @@
 			<tr>
 				<td>2017-08-31</td>
 				<td>Task Oriented Programming and the Internet of Things.</td>
-				<td><a href="http://2017.iflconference.org/">IFL17</a></td>
+				<td><a href="http://2017.iflconference.org/">IFL 2017</a></td>
 			</tr>
 			<tr>
 				<td><a href="https://git.martlubbers.net/?p=mastervoorlichting16.git">2017-03-11</a></td>