merge and squash dev into master

euryalus · Aug 10, 2017 · d4d51e7 · d4d51e7
1 parent 8c512da
commit d4d51e7
Show file tree

Hide file tree

Showing 2 changed files with 6 additions and 4 deletions.
diff --git a/contents/about/team.json b/contents/about/team.json
@@ -12,7 +12,7 @@
     "img":"https://placehold.it/400x400"    
   },
   {
-    "name":"Andreas Bulling",
+    "name":"Dr. Andreas Bulling",
     "contact":"[email protected]",
     "role":"Partner, Scientific Adviser",
     "img":"https://placehold.it/400x400"    
@@ -24,7 +24,7 @@
   },
   {
     "name":"Marc Tonsen",
-    "role":"Research & Development Engineer",
+    "role":"Partner, Research & Development Engineer",
     "img":"https://placehold.it/400x400"
   },
   {
@@ -34,7 +34,7 @@
   },
   {
     "name":"Douglas Mackay",
-    "role":"Electrical Engineer",
+    "role":"Hardware Development & Production Manager",
     "img":"https://placehold.it/400x400"    
   },
   {
@@ -48,7 +48,7 @@
     "img":"https://placehold.it/400x400"    
   },
   { 
-    "name":"Kai Dierkes",
+    "name":"Dr. Kai Dierkes",
     "role":"Research & Development Engineer",
     "img":"https://placehold.it/400x400"    
   },

diff --git a/templates/about.jade b/templates/about.jade
@@ -41,6 +41,7 @@ block main
                   h4 We are currently focusing our development efforts on Pupil – a mobile eye tracking headset and open source software framework – and on developing open source tools for virtual reality, augmented reality, and mixed reality.
 
     //- team
+    a(name="team")
     div.Site-content-container
       div.Feature-container-column
         div.Grid.Grid--justifyCenter.Grid--center.Grid--alignContentCenter.Feature-row
@@ -90,6 +91,7 @@ block main
 
 
     //- imprint
+    a(name="imprint")
     div.Site-gray-bkg
       div.Site-content-container
         div.Feature-container-column