Merge branch 'master' of gl.kwarc.info:kwarc/website

people/dmueller.md

@@ -12,4 +12,5 @@ pic: public/images/dmueller.jpg
 
 ### Contact Details: 
 Email: "d." + lastname.replace("ü","ue") + "@" + this.domain
+
 [My blog](http://blog.logicalphalluses.net/)

people/tpollinger.md

+---
+layout: person
+title: Theresa Pollinger
+fullname: Theresa Pollinger
+affiliation: Computational Engineering, FAU Erlangen-Nürnberg
+pic: public/images/tpollinger.jpg
+account: tpollinger
+role: master-student
+start_date: 2017-05
+
+---
+ 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.