diff --git a/hakyll-bootstrap/team/mickael_el_karroubi.md b/hakyll-bootstrap/team/mickael_el_karroubi.md
new file mode 100644
index 0000000000000000000000000000000000000000..be928855fd72040935d37aa221f6df4d188c1649
--- /dev/null
+++ b/hakyll-bootstrap/team/mickael_el_karroubi.md
@@ -0,0 +1,11 @@
+---
+title: Mickael El Kharroubi
+photo: "/img/heads/elk.png"
+date: 2020-10-10
+---
+
+I am an HES engineer in computer science, I am currently performing a master degree at the University of Geneva.
+In parallel, I am a teaching assistant at the Technical University of Western Switzerland for the
+applied mathematics and physics courses.
+My main research topic is in High Performance Computing by working on a new MPI backend for the
+functional language Futhark.
diff --git a/hakyll-bootstrap/templates/team.html b/hakyll-bootstrap/templates/team.html
new file mode 100644
index 0000000000000000000000000000000000000000..75d08e05c1a42565ee59191ed2b0da3fd627c1b9
--- /dev/null
+++ b/hakyll-bootstrap/templates/team.html
@@ -0,0 +1,56 @@
+<!DOCTYPE HTML>
+<html lang="en">
+ <head>
+ <meta charset="utf-8">
+ <meta name="viewport" content="width=device-width, initial-scale=1.0">
+ <meta name="description" content="">
+ <meta name="author" content="">
+ <title>$title$</title>
+ <link href="/css/bootstrap.css" rel="stylesheet">
+ <link href="/css/syntax.css" rel="stylesheet">
+ <link href="/css/carousel.css" rel="stylesheet">
+ <link href='http://fonts.googleapis.com/css?family=Open+Sans' rel='stylesheet' type='text/css'>
+ <style>
+ body {
+ font-family: 'Open Sans', sans-serif;
+ }
+ body { margin-top: 80px; }
+ footer { margin-top: 80px; }
+ </style>
+ </head>
+ <body>
+ $partial("templates/nav.html")$
+
+ <div class="container">
+ <h1>$title$</h1>
+ <h2>Research group and collaborations</h2>
+ <ul>
+ $for(posts)$
+ <hr class="featurette-divider">
+
+ <div class="row featurette">
+ <div class="col-md-5">
+ <img class="img-circle" src="$photo$" alt="$title$">
+ </div>
+ <div class="col-md-7">
+ <h3>$title$</h3>
+ <p class="lead">
+ $body$
+ </p>
+ </div>
+ </div>
+
+ <!-- <li>
+ <a href="$url$">$title$</a> - $date$
+ </li> -->
+ $endfor$
+ </ul>
+ $partial("templates/footer.html")$
+ </div>
+
+ </div><!-- /.container -->
+ <script src="/js/jquery.js"></script>
+ <script src="/js/bootstrap.js"></script>
+ <script src="/js/holder.js"></script>
+ </body>
+</html>