Updated work for autumn 2016; updated work order; spaces to tabs

1 files changed, 29 insertions, 15 deletions

diff --git a/resources/jade/index.jade b/resources/jade/index.jade
index 4ac4083..8afb3c7 100644
--- a/resources/jade/index.jade
+++ b/resources/jade/index.jade
@@ -4,13 +4,13 @@ block content
 	h1 Camil Staps
 	hr
 	img#profile(alt="Camil Staps", style="float:left;", src="/assets/img/profile-300x300.png", width="170")
-	p Bachelor student #[a(href="http://www.ru.nl/opleidingen/bachelor/informatica/") Computing Science] and #[a(href="http://www.ru.nl/opleidingen/bachelor/theologie/") Theology]; freelance programmer
+	p #[a(href="mailto:info@vivisoft.nl") Freelance programmer]; Bachelor student #[a(href="http://www.ru.nl/opleidingen/bachelor/informatica/") Computing Science] and #[a(href="http://www.ru.nl/opleidingen/bachelor/theologie/") Theology]
 	p(style='white-space:pre;')
 		span.tt info@camilstaps.nl
 		br
 		| GPG ID: #[a(href="http://pgp.mit.edu/pks/lookup?op=get&search=0x4A9BFD4F6A415F83") 6A315F83]
 		br
-		| Fingerprint: #[span.tt 7F41 677C FA51 D2AE 8A4A  C47D 4A9B FD4F 6A41 5F83]
+		| Fingerprint: #[span.tt 7F41 677C FA51 D2AE 8A4A	C47D 4A9B FD4F 6A41 5F83]
 	p
 		a(href="https://github.com/camilstaps") GitHub
 		br
@@ -22,7 +22,7 @@ block content
 
 	hr
 
-	table
+	table.main_table
 		tr
 			td I like:
 			td Functional programming (#[a(href="http://clean.cs.ru.nl/Clean") Clean]), Linux (Debian; Ubuntu Server), LaTeX (TikZ), PIC microcontrollers, CoffeeScript, regular expressions, Git, Bash
@@ -37,22 +37,36 @@ block content
 			td R, more functional programming, Node.js, Docker, LXC, functional programming on microcontrollers, data mining
 	
 	h2 Work
-	table
+	table.main_table
+		tr
+			td 2013 - present
+			td Owner of #[a(href="https://vivisoft.nl") ViviSoft]. #[a(href="mailto:info@camilstaps.nl") Contact me] for any projects in software or hardware development.
 		tr
 			td 2015 - present
 			td 
 				p Student assistant at the #[a(href="http://www.ru.nl/science") Faculty of Science] at the Radboud University Nijmegen
-				ul
-					li Autumn 2015, #[a(href="http://www.cs.ru.nl/~hubbers/courses/ms_1516/") Mathematical Structures]
-					li Winter 2015-16, #[a(href="http://www.cs.ru.nl/~hubbers/courses/co_1516/") Combinatorics]
-					li Spring - Summer 2016, #[a(href="http://www.studiegids.science.ru.nl/2015/science/prospectus/inf_ba/course/37072/") Functional Programming 1] and #[a(href="http://www.studiegids.science.ru.nl/2015/course/37073/") 2]
-					li Spring - Summer 2016, #[a(href="http://www.studiegids.science.ru.nl/2015/science/prospectus/inf_ba/course/37067/") Introduction to Cryptography]
-		tr
-			td 2013 - present
-			td Owner of #[a(href="https://vivisoft.nl") ViviSoft]. #[a(href="mailto:info@camilstaps.nl") Contact me] for any projects in software or hardware development.
+				table
+					tr
+						td 2016-17
+						td #[a(href="http://studiegids.science.ru.nl/2016/science/prospectus/inf_ba/course/40559/") Algorithms and Data Structures]
+					tr
+						td
+						td #[a(href="http://cs.ru.nl/~hubbers/courses/co_1617/") Combinatorics]
+					tr
+						td 2015-16
+						td #[a(href="http://www.studiegids.science.ru.nl/2015/science/prospectus/inf_ba/course/37072/") Functional Programming 1] and #[a(href="http://www.studiegids.science.ru.nl/2015/course/37073/") 2]
+					tr
+						td
+						td #[a(href="http://www.studiegids.science.ru.nl/2015/science/prospectus/inf_ba/course/37067/") Introduction to Cryptography]
+					tr
+						td
+						td #[a(href="http://www.cs.ru.nl/~hubbers/courses/co_1516/") Combinatorics]
+					tr
+						td
+						td #[a(href="http://www.cs.ru.nl/~hubbers/courses/ms_1516/") Mathematical Structures]
 
 	h2 Education
-	table
+	table.main_table
 		tr
 			td 2014-2017
 			td BSc. #[a(href="http://www.ru.nl/opleidingen/bachelor/informatica/") Computing Science & Cyber Security], Radboud University Nijmegen. Some of my work related to this education may be found on #[a(href="https://git.camilstaps.nl") git.camilstaps.nl]; releases appear on #[a(href="https://files.camilstaps.nl") files.camilstaps.nl].
@@ -61,7 +75,7 @@ block content
 			td BA. #[a(href="http://www.ru.nl/opleidingen/bachelor/theologie/") Theology], Radboud University Nijmegen. Some of my work related to this education may be found on #[a(href="https://files.camilstaps.nl") files.camilstaps.nl].
 
 	h2 Software projects & libraries
-	table
+	table.main_table
 		tr
 			td: a(href="http://cloogle.org/") Cloogle
 			td Hoogle clone for Clean (co-author & co-maintainer)
@@ -82,7 +96,7 @@ block content
 			td Python implementation of the #[a(href="https://eprint.iacr.org/2014/453") PRIDE] cipher
 		tr
 			td: a(href="https://github.com/camilstaps/bibletext") bibletext
-			td LaTeX package for inserting Bible texts by specifying references (#[a(href="http://ctan.org/pkg/bibletext") CTAN]) (author & maintainer)
+			td LaTeX package for inserting Bible texts by specifying references (#[a(href="http://ctan.org/pkg/bibletext") CTAN])
 
 	p Find more on #[a(href="https://github.com/camilstaps") GitHub] and #[a(href="https://git.camilstaps.nl/") git.camilstaps.nl].