From 8e9c97a2b4156da8760b98589e8f7bba4cb7ca58 Mon Sep 17 00:00:00 2001
From: Mart Lubbers <mart@martlubbers.net>
Date: Fri, 5 Jan 2018 20:54:18 +0100
Subject: [PATCH] update index

---
 index.html | 30 ++++++++++++++++++++++++------
 1 file changed, 24 insertions(+), 6 deletions(-)

diff --git a/index.html b/index.html
index 19f7649..0203e17 100644
--- a/index.html
+++ b/index.html
@@ -19,8 +19,8 @@
 			<tr>
 				<td><img src="./p.jpg" width="120" alt="Photo" /></td>
 				<td>
-					Master Student (Software Science)<br />
-					Radboud University<br />
+					Researcher/Teacher<br />
+					<a href="https://www.defensie.nl/onderwerpen/defensieacademie">NLDA</a><br />
 					<tt>mart@martlubbers.net(GPG: <a href="http://martlubbers.net/mart@martlubbers.net.asc" title="Fingerprint: 74FF FBF1 4758 273B 2F56  A30C A937 B7A1 AD3F EBE7">AD3FEBE7</a>)</tt><br />
 					<a href="http://www.linkedin.com/pub/mart-lubbers/1b/76a/763">LinkedIn</a> - <a href="https://github.com/dopefishh">Github</a> - <a href="https://git.martlubbers.net">Other git repos</a>
 				</td>
@@ -35,7 +35,14 @@
 				<th>Function</th>
 			</tr>
 			<tr>
-				<td>2016-07</td>
+				<td>2017-09</td>
+				<td>2017-12</td>
+				<td>
+					Researcher/Teacher at the <a href="https://www.defensie.nl/onderwerpen/defensieacademie">NLDA</a>)
+				</td>
+			</tr>
+			<tr>
+				<td>2017-07</td>
 				<td></td>
 				<td>
 					Programmer for <a href="http://www.wi-sense.nl/">Wi-Sense</a>.
@@ -43,7 +50,7 @@
 			</tr>
 			<tr>
 				<td>2016-02</td>
-				<td></td>
+				<td>2017-07</td>
 				<td>
 					Student assistant at the Radboud University:<br />
 					2016/2017: Functional Programming 1<br />
@@ -70,8 +77,9 @@
 		</table>
 
 		<h3>Publications</h3>
+		<p>Master's Thesis: Task Oriented Programming and the Internet of Things (2017)</p>
 		<p>Schuerman, W., Torreira, F., &amp; Lubbers, Mart. (2015). Praatalign: Phonetic Alignment Made Easier For Psycholinguistic Data Processing. Architectures and Mechanisms for Language Processing, 92.</p>
-		<p>Bachelor's Thesis: Adaptable Crawler Specification Generation System for Leisure Activity RSS Feeds</p>
+		<p>Bachelor's Thesis: Adaptable Crawler Specification Generation System for Leisure Activity RSS Feeds (2015)</p>
 
 		<h3>Teaching and talks</h3>
 		<table>
@@ -79,6 +87,16 @@
 				<th>Date/Files</th>
 				<th>Description</th>
 			</tr>
+			<tr>
+				<td>2018-01-05</td>
+				<td>Task Oriented Pearl: Distributed Blockchain Applications</td>
+				<td><a href="http://wiki.clean.cs.ru.nl/NL-FP_dag_2018">NLFP18</a></td>
+			</tr>
+			<tr>
+				<td>2017-08-31</td>
+				<td>Task Oriented Programming and the Internet of Things</td>
+				<td><a href="http://iflconference.org/">IFL17</a></td>
+			</tr>
 			<tr>
 				<td><a href="https://git.martlubbers.net/?p=mastervoorlichting16.git">2017-03-11</a></td>
 				<td><a href="http://www.ru.nl/english/education/masters/software-science/" title="The evening incorporated standing on the masters market to provide information for upcoming students">Software Science</a> masters. <a href="http://ru.nl">RU</a>.</td>
@@ -169,6 +187,6 @@
 		<p>Valid XHTML 1.0 Strict</p>
 		<p>Best viewed with a screen resolution &gt;= 640x480 or &gt;=80x24 text mode in one of <a href="https://en.wikipedia.org/wiki/List_of_web_browsers">these browsers.</a></p>
 		<p>The source of this website can be found <a href="https://git.martlubbers.net/?p=martlubbers.net.git">here</a></p>
-		<p>Last updated: 2016-09-23</p>
+		<p>Last updated: 2017-10-11</p>
 	</body>
 </html>
-- 
2.20.1