Merge branch 'master' of gl.kwarc.info:static/www.kwarc.info

.gitlab-ci.yml

@@ -36,6 +36,6 @@ deploy_staging:
     # build the website
     - bundle exec jekyll build -d _site
     # copy over all the files into the deployment folder
-    - cd _site && rsync -rv -e ssh --checksum ./ deploy@magma.informatik.uni-erlangen.de:/var/www/www.kwarc.info --delete
+    - cd _site && rsync -rv -e ssh --checksum ./ deploy@static.kwarc.info:/var/www/www.kwarc.info --delete
   only:
     - master
\ No newline at end of file

events/Tetrapod-2018.md

@@ -44,7 +44,15 @@ Of particular interest are
 
 #### Invited speakers and topics
 
-Invitations in progress
+| Speaker           | Modularity in...         |
+| ----------------- | ------------------------ |
+| Catherine Dubois  | Proof Checking           |
+| Georges Gonthier  | Large Proofs             |
+| Till Mossakowski  | Ontologies               |
+| Natarajan Shankar | Proof Assistants         |
+| Doug Smith        | Software Synthesis       |
+| Nicolas M. Thiery | Mathematical Computation |
+
 
 #### Procedures for selecting papers
   The organizers will select invited speakers and topics.

people/tpollinger.md

@@ -12,4 +12,5 @@ affiliation: Computational Engineering, FAU Erlangen-Nürnberg
 ---
 
 ### Description
-I am doing my Master's thesis at the KWARC group, somewhere in the field between Mathematical Knowledge Representation and High Performance Simulations. If you are interested in the current status of the topic, feel free to contact me.
+I did my Master's thesis at the KWARC group, somewhere in the field between Knowledge Representation and Mathematical Modeling and Simulations. 
+