diff --git a/CNAME b/CNAME
index 48e5bab..5ec2687 100644
--- a/CNAME
+++ b/CNAME
@@ -1 +1 @@
-www.nardoz.com
+nardoz.com
\ No newline at end of file
diff --git a/_config.yml b/_config.yml
index dd1a197..de1b593 100644
--- a/_config.yml
+++ b/_config.yml
@@ -4,7 +4,7 @@ permalink: /:categories/:year/:month/:day/:title
 
 exclude: [".rvmrc", ".rbenv-version", "README.md", "Rakefile", "changelog.md"]
 auto: true
-pygments: true
+highlighter: rouge
 
 # Themes are encouraged to use these universal variables
 # so be sure to set them if your theme uses them.
diff --git a/_includes/JB/setup b/_includes/JB/setup
index efcd84b..af87a61 100644
--- a/_includes/JB/setup
+++ b/_includes/JB/setup
@@ -16,7 +16,7 @@
     {% if site.JB.ASSET_PATH %}
       {% assign ASSET_PATH = site.JB.ASSET_PATH %}
     {% else %}
-      {% capture ASSET_PATH %}{{ BASE_PATH }}/assets/themes/{{ page.theme.name }}{% endcapture %}
-    {% endif %}  
+      {% capture ASSET_PATH %}{{ BASE_PATH }}/assets/themes/{{ layout.theme.name }}{% endcapture %}
+    {% endif %}
   {% endif %}
 {% endcapture %}{% assign jbcache = nil %}
\ No newline at end of file
diff --git a/_includes/themes/nardoz/default.html b/_includes/themes/nardoz/default.html
index 684646d..8cdb50a 100644
--- a/_includes/themes/nardoz/default.html
+++ b/_includes/themes/nardoz/default.html
@@ -15,7 +15,9 @@
     <!-- Le styles -->
     <link href="{{ ASSET_PATH }}/bootstrap/css/bootstrap.min.css" rel="stylesheet">
     <link href="{{ ASSET_PATH }}/bootstrap/css/bootstrap-responsive.min.css" rel="stylesheet">
-    <link href="{{ ASSET_PATH }}/css/style.css?body=1" rel="stylesheet" type="text/css" media="all">
+    <link href='http://fonts.googleapis.com/css?family=Open+Sans:300,700' rel='stylesheet' type='text/css' />
+    <link href="{{ ASSET_PATH }}/css/members.css" rel="stylesheet" type="text/css" media="all">
+    <link href="{{ ASSET_PATH }}/css/style.css" rel="stylesheet" type="text/css" media="all">
 
     <!-- Le fav and touch icons -->
   <!--
@@ -38,10 +40,10 @@
     <div id="navigation">
         <a class="logo" href="{{ HOME_PATH }}">{{ site.title }}</a>
         <ul>
-          <li{% if page.url == "talks.html" %} class="active"{% endif %}><a href="{{ BASE_PATH }}talks.html">Talks</a></li>
+          <li><a href="{{ HOME_PATH }}">Talks</a></li>
           <li{% if page.url == "projects.html" %} class="active"{% endif %}><a href="{{ BASE_PATH }}projects.html">Proyectos</a></li>
           <li{% if page.url == "members.html" %} class="active"{% endif %}><a href="{{ BASE_PATH }}community.html">Comunidad</a></li>
-          <li{% if page.url == "blog.html" %} class="active"{% endif %}><a href="{{ BASE_PATH }}blog.html">Blog</a></li>
+          <!-- <li{% if page.url == "blog.html" %} class="active"{% endif %}><a href="{{ BASE_PATH }}blog.html">Blog</a></li> -->
 
 
           <!--
diff --git a/assets/themes/nardoz/css/members.css b/assets/themes/nardoz/css/members.css
new file mode 100644
index 0000000..b804064
--- /dev/null
+++ b/assets/themes/nardoz/css/members.css
@@ -0,0 +1,129 @@
+.member-grid {
+  margin: 20px 0 0 0;
+  padding: 0;
+  list-style: none;
+  display: block;
+  text-align: center;
+  width: 100%;
+}
+
+.member-grid:after,
+.member-item:before {
+  content: '';
+    display: table;
+}
+
+.member-grid:after {
+  clear: both;
+}
+
+.member-grid li {
+  width: 220px;
+  height: 220px;
+  display: inline-block;
+  margin: 20px;
+}
+
+.member-item {
+  width: 100%;
+  height: 100%;
+  border-radius: 50%;
+  position: relative;
+  cursor: default;
+  box-shadow:
+    inset 0 0 0 0 rgba(200,95,66, 0.4),
+    inset 0 0 0 16px rgba(255,255,255,0.6),
+    0 1px 2px rgba(0,0,0,0.1);
+  background-position: center center;
+  -webkit-transition: all 0.4s ease-in-out;
+  -moz-transition: all 0.4s ease-in-out;
+  -o-transition: all 0.4s ease-in-out;
+  -ms-transition: all 0.4s ease-in-out;
+  transition: all 0.4s ease-in-out;
+}
+
+.member-info {
+  position: absolute;
+  width: 100%;
+  height: 100%;
+  border-radius: 50%;
+  opacity: 0;
+
+  -webkit-transition: all 0.4s ease-in-out;
+  -moz-transition: all 0.4s ease-in-out;
+  -o-transition: all 0.4s ease-in-out;
+  -ms-transition: all 0.4s ease-in-out;
+  transition: all 0.4s ease-in-out;
+
+  -webkit-transform: scale(0);
+  -moz-transform: scale(0);
+  -o-transform: scale(0);
+  -ms-transform: scale(0);
+  transform: scale(0);
+
+  -webkit-backface-visibility: hidden; /*for a smooth font */
+
+}
+
+.member-info h3.one-line {
+  padding-top: 55px;
+}
+
+.member-info h3 {
+  text-align: center;
+  color: #fff;
+  text-transform: uppercase;
+  position: relative;
+  letter-spacing: 2px;
+  font-size: 22px;
+  margin: 0 20px;
+  padding: 40px 0 0 0;
+  font-family: 'Open Sans', Arial, sans-serif;
+  text-shadow:
+    0 0 1px #fff,
+    0 1px 2px rgba(0,0,0,0.3);
+}
+
+.member-info p {
+  color: #fff;
+  padding: 10px 5px;
+  font-style: italic;
+  margin: 0 30px;
+  font-size: 12px;
+  border-top: 1px solid rgba(255,255,255,0.5);
+}
+
+.member-info p a {
+  display: block;
+  color: #fff;
+  color: rgba(255,255,255,0.7);
+  font-style: normal;
+  font-weight: 700;
+  text-transform: uppercase;
+  font-size: 9px;
+  letter-spacing: 1px;
+  padding-top: 4px;
+  font-family: 'Open Sans', Arial, sans-serif;
+}
+
+.member-info p a:hover {
+  color: #fff222;
+  color: rgba(255,242,34, 0.8);
+}
+
+.member-item:hover {
+  box-shadow:
+    inset 0 0 0 110px rgba(200,95,66, 0.7),
+    inset 0 0 0 16px rgba(255,255,255,0.8),
+    0 1px 2px rgba(0,0,0,0.1);
+}
+
+.member-item:hover .member-info {
+  opacity: 1;
+
+  -webkit-transform: scale(1);
+  -moz-transform: scale(1);
+  -o-transform: scale(1);
+  -ms-transform: scale(1);
+  transform: scale(1);
+}
diff --git a/assets/themes/nardoz/css/style.css b/assets/themes/nardoz/css/style.css
index ac9da29..e15edc5 100644
--- a/assets/themes/nardoz/css/style.css
+++ b/assets/themes/nardoz/css/style.css
@@ -3,6 +3,14 @@ body {
   padding: 0;
 }
 
+.page-header {
+  margin-top: 40px;
+}
+
+.page-header h1 {
+  text-align: center
+}
+
 /* Custom container */
 .container-narrow {
   margin: 0 auto;
diff --git a/assets/themes/nardoz/js/projects.js b/assets/themes/nardoz/js/projects.js
index 81a7575..8086d4a 100644
--- a/assets/themes/nardoz/js/projects.js
+++ b/assets/themes/nardoz/js/projects.js
@@ -60,7 +60,7 @@ var projects = [
   },
   {
     title: 'PlayBafici',
-    author: 'Pablo Paladino, Alan Reid, Sebastián Scarano, Nicolás Melendez',
+    author: 'Pablo Paladino, Alan Reid, Sebastián Scarano, Nicolás Melendez, Federica Pelzel',
     description: 'Trivia sobre las películas del festival de Bafici. Aplicación ganadora de una mención especial en Cultura en el Hackatón del Gobierno de la Ciudad de Buenos Aires 2012.',
     links: [
       { title: 'Demo', url: 'http://playbafici.com.ar/' },
@@ -170,6 +170,16 @@ var projects = [
     ],
     tags: [ 'NodeJS', 'Javascript', 'Arduino', 'RaspberryPi' ]
   },
+  {
+    title: 'Fisotope',
+    author: 'Matias Saguir',
+    description: 'Plugin de Jquery que envuelve a la libreria Isotope permitiendo filtrar, ordenar y buscar tarjetas utilizando clases de html en vez de código Javascript',
+    links: [
+      { title: 'Demo', url: 'http://mativs.github.io/fisotope/example.html' },
+      { title: 'Repo en Github', url: 'https://github.com/mativs/fisotope' }
+    ],
+    tags: [ 'Javascript', 'Jquery' ]
+  },
 ];
 
 
diff --git a/community.html b/community.html
index 0394a98..ebbcdcb 100644
--- a/community.html
+++ b/community.html
@@ -1,84 +1,35 @@
 ---
 layout: page
 title: Comunidad
-tagline: Miembros &amp; Grupos
 ---
 {% include JB/setup %}
 
-<h3>Miembros de Nardoz</h3>
+<p>
+  Sumate a la nuestra comunidad de Slack! 
+  <script async defer src="http://slack.nardoz.com/slackin.js"></script>
+</p>
 
-<table id="members" class="table table-striped">
-	<tbody>
-		<tr>
-		  <td class="name">Alan Reid</td>
-		  <td><span class="label label-info">Fundador</span> <span class="label label-warning">Organizador</span></td>
-		  <td class="follow"><a href="https://twitter.com/alan_reid" class="twitter-follow-button" data-show-count="false" data-lang="es" data-size="large">Seguir a @alan_reid</a></td>
-		</tr>
-		<tr>
-		  <td class="name">Gustavo Arjones</td>
-		  <td> <span class="label label-info">Fundador</span></td>
-		  <td class="follow"><a href="https://twitter.com/arjones" class="twitter-follow-button" data-show-count="false" data-lang="es" data-size="large">Seguir a @arjones</a></td>
-		</tr>
-		<tr>
-		  <td class="name">Diego Ramírez</td>
-		  <td> <span class="label label-info">Fundador</span></td>
-		  <td class="follow"><a href="https://twitter.com/diegoram" class="twitter-follow-button" data-show-count="false" data-lang="es" data-size="large">Seguir a @diegoram</a></td>
-		</tr>
-		<tr>
-		  <td class="name">Luis Farzati</td>
-		  <td> <span class="label label-info">Fundador</span></td>
-		  <td class="follow"><a href="https://twitter.com/luisfarzati" class="twitter-follow-button" data-show-count="false" data-lang="es" data-size="large">Seguir a @luisfarzati</a></td>
-		</tr>
-		<tr>
-		  <td colspan="2" class="name">Pablo Paladino</td>
-		  <td class="follow"><a href="https://twitter.com/palamago" class="twitter-follow-button" data-show-count="false" data-lang="es" data-size="large">Seguir a @palamago</a></td>
-		</tr>
-		<tr>
-		  <td colspan="2" class="name">Sebastián Scarano</td>
-		  <td class="follow"><a href="https://twitter.com/develsas" class="twitter-follow-button" data-show-count="false" data-lang="es" data-size="large">Seguir a @develsas</a></td>
-		</tr>
-		<tr>
-		  <td colspan="2" class="name">Nicolás Meléndez</td>
-		  <td class="follow"><a href="https://twitter.com/nfmelendez" class="twitter-follow-button" data-show-count="false" data-lang="es" data-size="large">Seguir a @nfmelendez</a></td>
-		</tr>
-		<tr>
-		  <td colspan="2" class="name">Jorge Aliss</td>
-		  <td class="follow"><a href="https://twitter.com/jaliss" class="twitter-follow-button" data-show-count="false" data-lang="es" data-size="large">Seguir a @jaliss</a></td>
-		</tr>
-	</tbody>
-</table>
-
-<script>!function(d,s,id){var js,fjs=d.getElementsByTagName(s)[0],p=/^http:/.test(d.location)?'http':'https';if(!d.getElementById(id)){js=d.createElement(s);js.id=id;js.src=p+'://platform.twitter.com/widgets.js';fjs.parentNode.insertBefore(js,fjs);}}(document, 'script', 'twitter-wjs');</script>
-
-<h3>Grupos relacionados a Nardoz</h3>
+<h3>Meetups amigos</h3>
 
 <div class="row groups">
 
-	<div class="span6 meetup">
-		<iframe width="225" height="320" src="http://meetu.ps/1HTmpl" frameborder="0"></iframe>
+	<div class="span4 meetup">
+		<iframe width="225" height="570" src="http://meetu.ps/2NQp5r" frameborder="0"></iframe>
 	</div>
 
-	<div class="span6 meetup">
-		<iframe width="225" height="320" src="http://meetu.ps/1HTqFb" frameborder="0"></iframe>
+	<div class="span4 meetup">
+		<iframe width="225" height="570" src="http://meetu.ps/2NQnVY" frameborder="0"></iframe>
 	</div>
 
 </div>
-
 <div class="row groups">
 
-	<div class="span6 meetup">
-		<iframe width="225" height="320" src="http://meetu.ps/1HW3Cg" frameborder="0"></iframe>
-	</div>
-
-	<div class="span6 meetup">
-		<iframe width="225" height="320" src="http://meetu.ps/1HTr7n" frameborder="0"></iframe>
+	<div class="span4 meetup">
+		<iframe width="225" height="570" src="http://meetu.ps/2NQp6h" frameborder="0"></iframe>
 	</div>
 
-</div>
-
-<div class="row groups">
-	<div class="span6 meetup">
-		<iframe width="225" height="500" src="http://meetu.ps/1HTs2T" frameborder="0"></iframe>
+	<div class="span4 meetup">
+		<iframe width="225" height="570" src="http://meetu.ps/2NQp6M" frameborder="0"></iframe>
 	</div>
 
 </div>
diff --git a/index.html b/index.html
new file mode 100644
index 0000000..520995d
--- /dev/null
+++ b/index.html
@@ -0,0 +1,513 @@
+---
+layout: page
+title: Nardoz
+---
+{% include JB/setup %}
+
+<p>
+  Nardoz es una comunidad de desarrolladores que, cerveza de por medio, se reúnen a hablar y compartir sus experiencias con las últimas tecnologías.</p>
+<p>Las charlas son tan variadas como los intereses del grupo: desde <strong>programación</strong>, <strong>Big Data</strong> y <strong>sistemas distribuídos</strong>, hasta <strong>Open Hardware</strong> y <strong>Open Data</strong>.
+</p>
+<p>
+  Sumate a la nuestra comunidad de Slack!
+  <script async defer src="http://slack.nardoz.com/slackin.js"></script>
+</p>
+
+<hr>
+
+<h3>2018</h3>
+<table class="table table-striped table-bordered">
+  <thead>
+    <tr>
+      <th>Fecha</th>
+      <th>Título</th>
+    </tr>
+  </thead>
+  <tbody>
+    <tr>
+      <td>01/02/2018</td>
+      <td>
+        <strong>Sorting internals en JS / Minar Ethereum en tu casa</strong>
+        <ol>
+          <li><strong>¿Cómo ordenar tus medias usando Javascript?</strong> por <a target="_blank" href="https://twitter.com/koste4">@koste4</a></li>
+          <li><strong>La odisea de minar Ethereum en casa</strong> por <a target="_blank" href="https://twitter.com/VicTheDevops">@VicTheDevops</a></li>
+        </ol>
+      </td>
+    </tr>
+  </tbody>
+</table>
+
+<h3>2017</h3>
+<table class="table table-striped table-bordered">
+  <thead>
+    <tr>
+      <th>Fecha</th>
+      <th>Título</th>
+    </tr>
+  </thead>
+  <tbody>
+    <tr>
+      <td>05/12/2017</td>
+      <td>
+        <strong>Open Shift / Beyond Continuous Delivery / ASADO DE FIN DE AÑO</strong>
+        <ol>
+          <li><strong>Intro a OpenShift</strong> por <a target="_blank" href="https://twitter.com/vkmc">@vkmc</a></li>
+          <li><strong>Más allá de Continuous Delivery</strong> por <a target="_blank" href="https://twitter.com/gvilarino">@gvilarino</a></li>
+        </ol>
+      </td>
+    </tr>
+    <tr>
+      <td>04/10/2017</td>
+      <td>
+        <strong>Rust / Desarrollar sin jefes / Concurrencia en Java 8</strong>
+        <ol>
+          <li><strong>A Rusty world</strong> por <a target="_blank" href="https://twitter.com/badboy_">@badboy_</a></li>
+          <li><strong>Desarrollar sin jefes + Concurrencia en Java 8</strong> por <a target="_blank" href="https://twitter.com/gi_decuzzi">@gi_decuzzi</a></li>
+        </ol>
+      </td>
+    </tr>
+    <tr>
+      <td>06/09/2017</td>
+      <td>
+        <strong>GraphQL / Natural Language Processing</strong>
+        <ol>
+          <li><strong>Necesitás GraphQL</strong> por <a target="_blank" href="https://twitter.com/okbel">@okbel</a></li>
+          <li><strong>Un toolkit de NLP en español</strong> por <a target="_blank" href="https://twitter.com/eisenjulian">@eisenjulian</a></li>
+        </ol>
+      </td>
+    </tr>
+    <tr>
+      <td>08/08/2017</td>
+      <td>
+        <strong>React Storybook &amp; Snapshot Testing / Polybox / Elasticsearch en AWS</strong>
+        <ol>
+          <li><strong>React Storybook &amp; Snapshot Testing    </strong> por <a target="_blank" href="https://twitter.com/solepano">@solepano</a></li>
+          <li><strong>Polybox</strong> por <a target="_blank" href="https://twitter.com/marcosnils">@marcosnils</a></li>
+          <li><strong>Lecciones aprendidas con elasticsearch en AWS </strong> por <a target="_blank" href="https://www.linkedin.com/in/lucia-brizuela-0472ba29/">Lucía Brizuela</a></li>
+        </ol>
+      </td>
+    </tr>
+    <tr>
+      <td>30/05/2017</td>
+      <td>
+        <strong>Chakra + JS types / Nomad vs. Docker / RasPi sumergible</strong>
+        <ol>
+          <li><strong>Agregando tipos a JS + Chakra</strong> por <a target="_blank" href="https://nardoz.slack.com/team/fcaste">Franco Castellacci</a></li>
+          <li><strong>Nomad: a love story </strong> por <a target="_blank" href="https://twitter.com/sebamontini">@sebamontini</a></li>
+          <li><strong>Haciendo un termómetro digital sumergible con la Raspberry Pi</strong> por <a target="_blank" href="https://twitter.com/nfmelendez">@nfmelendez</a></li>
+        </ol>
+      </td>
+    </tr>
+    <tr>
+      <td>02/02/2017</td>
+      <td>
+        <strong>WebVR / React / Rust</strong>
+        <ol>
+          <li><strong>WebVR pa’ los pibes (y las pibas también)</strong> por <a target="_blank" href="https://twitter.com/impronunciable">@impronunciable</a></li>
+          <li><strong>How to (maybe) structure a React application</strong> por <a target="_blank" href="https://twitter.com/keyserfaty ">@keyserfaty </a></li>
+          <li><strong>Rust de abajo para arriba</strong> por <a target="_blank" href="https://twitter.com/seppo0011">@seppo0011</a></li>
+        </ol>
+      </td>
+    </tr>
+  </tbody>
+</table>
+
+<h3>2016</h3>
+<table class="table table-striped table-bordered">
+  <thead>
+    <tr>
+      <th>Fecha</th>
+      <th>Título</th>
+    </tr>
+  </thead>
+  <tbody>
+    <tr>
+      <td>15/11/2016</td>
+      <td>
+        <strong>Asado Nardoz de fin de año</strong>
+        <ol>
+          <li><strong>Perdiodismo de Datos</strong> por <a target="_blank" href="https://twitter.com/palamago">@palamago</a></li>
+          <li><strong>Move slow &amp; make things</strong> por <a target="_blank" href="https://twitter.com/alan_reid ">@alan_reid </a></li>
+        </ol>
+      </td>
+    </tr>
+    <tr>
+      <td>15/11/2016</td>
+      <td>
+        <strong>Videojuegos en 13KB / Datastax / Reactive Scala</strong>
+        <ol>
+          <li><strong>Videojuegos en 13KB</strong> por <a target="_blank" href="https://twitter.com/agar3s">@agar3s</a></li>
+          <li><strong>Datastax Analytics</strong> por <a target="_blank" href="https://twitter.com/arjones">@arjones</a></li>
+          <li><strong>Reactive programming en Scala</strong> por <a target="_blank" href="https://twitter.com/clariallende">@clariallende</a></li>
+        </ol>
+      </td>
+    </tr>
+    <tr>
+      <td>13/09/2016</td>
+      <td>
+        <strong>ELM / Ansible / Top-Secret</strong>
+        <ol>
+          <li><strong>Intro to ELM</strong> por <a target="_blank" href="https://twitter.com/quixote_arg">@quixote_arg</a></li>
+          <li><strong>Ansible 202</strong> por <a target="_blank" href="https://twitter.com/sebamontini">@sebamontini</a></li>
+          <li><strong>TOP SECRET PROJECT</strong> por <a target="_blank" href="https://twitter.com/marcosnils">@marcosnils</a></li>
+        </ol>
+      </td>
+    </tr>
+    <tr>
+      <td>10/08/2016</td>
+      <td>
+        <strong>Crypto / Redux / Escalando infraestructura crítica</strong>
+        <ol>
+          <li><strong>Intro to crypto</strong> por <a target="_blank" href="https://twitter.com/quixote_arg">@quixote_arg</a></li>
+          <li><strong>Intro to Redux </strong> por <a target="_blank" href="https://twitter.com/topicus">@topicus</a></li>
+          <li><strong>Crónica de una escala anunciada</strong> por <a target="_blank" href="https://twitter.com/dschenkelman">@dschenkelman</a></li>
+        </ol>
+      </td>
+    </tr>
+    <tr>
+      <td>02/06/2016</td>
+      <td>
+        <strong>Docker / Ethereum / Resin</strong>
+        <ol>
+          <li><strong>Docker avanzado: docker-compose y docker-swarm</strong> por <a target="_blank" href="https://twitter.com/gvilarino">@gvilarino</a></li>
+          <li><strong>Intro to the Ethereum Block Chain for devs </strong> por <a target="_blank" href="https://twitter.com/nsandller">@nsandller</a></li>
+          <li><strong>Devops for IoT</strong> por <a target="_blank" href="https://twitter.com/pcarranzav">@pcarranzav</a></li>
+        </ol>
+      </td>
+    </tr>
+    <tr>
+      <td>21/04/2016</td>
+      <td>
+        <strong>Nardoz de Docker</strong>
+        <ol>
+          <li><strong>Intro a Docker</strong> por <a target="_blank" href="https://twitter.com/gvilarino">@gvilarino</a></li>
+          <li><strong>Docker avanzado</strong> por <a target="_blank" href="https://twitter.com/marcosnils">@marcosnils</a></li>
+          <li><strong>RaspberryPi + Spotify + Slack</strong> por <a target="_blank" href="https://twitter.com/baires">@baires</a></li>
+        </ol>
+      </td>
+    </tr>
+  </tbody>
+</table>
+
+<h3>2015</h3>
+<table class="table table-striped table-bordered">
+  <thead>
+    <tr>
+      <th>Fecha</th>
+      <th>Título</th>
+    </tr>
+  </thead>
+  <tbody>
+    <tr>
+      <td>02/07/2015</td>
+      <td>
+        <strong>Nardoz de Rust</strong>
+        <ol>
+          <li><strong>Conceptos principales y diferenciales</strong> por <a target="_blank" href="https://twitter.com/nfmelendez">@nfmelendez</a></li>
+          <li><strong>Construir una Base de Datos en Rust</strong> por <a target="_blank" href="https://twitter.com/seppo0010">@seppo0010</a></li>
+        </ol>
+      </td>
+    </tr>
+    <tr>
+      <td>20/06/2015</td>
+      <td>
+        <strong>HackDay: Data visualizations with Twitter data V2</strong>
+      </td>
+    </tr>
+  </tbody>
+</table>
+
+<h3>2014</h3>
+<table class="table table-striped table-bordered">
+  <thead>
+    <tr>
+      <th>Fecha</th>
+      <th>Título</th>
+    </tr>
+  </thead>
+  <tbody>
+    <tr>
+      <td>23/09/2014</td>
+      <td>
+        <strong>Edge.js</strong> por <a target="_blank" href="https://twitter.com/tjanczuk">@tjanczuk</a>
+      </td>
+    </tr>
+    <tr>
+      <td>20/09/2014</td>
+      <td>
+        <strong>HackDay: Data visualizations with Twitter data</strong>
+      </td>
+    </tr>
+    <tr>
+      <td>13/08/2014</td>
+      <td>
+        <strong>Apache Spark: Un framework de procesamiento rápido a gran escala</strong> por <a target="_blank" href="https://twitter.com/arjones">@arjones</a>
+      </td>
+    </tr>
+    <tr>
+      <td>14/05/2014</td>
+      <td>
+        <strong>Criptonardoz: Introducción a la criptografía</strong> por <a target="_blank" href="https://twitter.com/quixote_arg">@quixote_arg</a>
+      </td>
+    </tr>
+    <tr>
+      <td>24/04/2014</td>
+      <td>
+        <strong>Nardoz de Escalabilidad de Juegos Masivos con Google Cloud</strong> por <a target="_blank" href="https://twitter.com/hernanliendo">@hernanliendo</a>
+      </td>
+    </tr>
+    <tr>
+      <td>25/02/2014</td>
+      <td>
+        <strong>Nardoz de Criptomonedas</strong> por <a target="_blank" href="https://twitter.com/maraoz">@maraoz</a>
+      </td>
+    </tr>
+    <tr>
+      <td>17/02/2014</td>
+      <td>
+        <strong>Where's my straw? What does a drive-thru have to teach us about optimization of tools and processes?</strong> por <a target="_blank" href="https://twitter.com/getify">@getify</a>
+      </td>
+   </tr>
+  </tbody>
+</table>
+
+<h3>2013</h3>
+<table class="table table-striped table-bordered">
+  <thead>
+    <tr>
+      <th>Fecha</th>
+      <th>Título</th>
+    </tr>
+  </thead>
+  <tbody>
+     <tr>
+        <td>17/12/2013</td>
+        <td>
+          <strong>Asado de fin de año</strong>
+        </td>
+     </tr>
+    <tr>
+      <td>04/12/2013</td>
+      <td>
+        <strong>Nardoz de UI/UX: Elementos de diseño de interfaces</strong> por <a target="_blank" href="https://twitter.com/pixelbeat">@pixelbeat</a>
+      </td>
+   </tr>
+    <tr>
+      <td>13/11/2013</td>
+      <td>
+        <strong>Nardoz de virtualización</strong>
+        <ol>
+          <li><strong>Vagrant: Creando ambientes de desarrollo aislados y replicables</strong> <br />por <a target="_blank" href="https://twitter.com/guidomb">@guidomb</a></li>
+          <li><strong>Docker</strong> por <a target="_blank" href="https://twitter.com/frodriguez">@frodriguez</a></li>
+        </ol>
+      </td>
+   </tr>
+    <tr>
+      <td>05/10/2013</td>
+      <td>
+        <strong>Coffeescript &amp; Backbone + Q&amp;A</strong> por <a target="_blank" href="https://twitter.com/jashkenas">@jashkenas</a> (Creador de Backbone, Coffescript y Underscore)<br />
+      </td>
+    </tr>
+    <tr>
+      <td>03/10/2013</td>
+      <td>
+        <strong>DIY Electronics</strong>
+        <ol>
+        <li><strong>Kiwi: Estaciones de bicicletas automatizadas (Arduino + RaspberryPi)</strong> <br />por <a target="_blank" href="https://twitter.com/alan_reid">@alan_reid</a> &amp; Ignacio Orlandini</li>
+          <li><strong>Quadcopter y bot con Arduino</strong> por <a target="_blank" href="https://twitter.com/arjones">@arjones</a> y <a target="_blank" href="https://twitter.com/saientzg">@saientzg</a></li>
+          <li><strong>ElBraian: Bot autónomo con RaspberryPi</strong> por <a target="_blank" href="https://twitter.com/DiegoRam">@DiegoRam</a></li>
+        </ol>
+      </td>
+   </tr>
+   <tr>
+      <td>24/07/2013</td>
+      <td>
+        <strong>Nardoz Mobile</strong>
+        <ol>
+          <li><strong>iOS, Android, BlackBerry</strong> por <a target="_blank" href="https://twitter.com/f0go">@f0go</a></li>
+          <li><strong>FirefoxOS</strong> por <a target="_blank" href="https://twitter.com/deimidis">@deimidis</a></li>
+        </ol>
+        <u>Invitados especiales:</u>
+        <ul>
+          <li>Diana Livits (Relationship Marketing Manager, Mozilla)</li>
+          <li>Mark Cranson (Mobile Business Development, Mozilla)</li>
+          <li>Patrick Hundal (Technical Business Development, Mozilla)</li>
+        </ul>
+      </td>
+    </tr>
+    <tr>
+      <td>19/06/2013</td>
+      <td>
+        <strong>Real World Akka Recipes</strong> por <a target="_blank" href="https://twitter.com/jamie_allen">@jamie_allen</a> (Director of Consulting, Typesafe)<br />
+        <span class="label label-important">Buenos Aires High Scalability Group</span>
+      </td>
+    </tr>
+    <tr>
+      <td>17/06/2013</td>
+      <td>
+        <strong>Effective Akka</strong> por <a target="_blank" href="https://twitter.com/jamie_allen">@jamie_allen</a> (Director of Consulting, Typesafe)<br />
+        <span class="label label-important">Scala User Group Argentina</span>
+
+      </td>
+    </tr>
+    <tr>
+      <td>30/05/2013</td>
+      <td>
+        <strong>Nardoz do diablo: Javascript Framework Battle</strong>
+        <ol>
+          <li><strong>AngularJS</strong> por <a target="_blank" href="https://twitter.com/mgonto">@mgonto</a></li>
+          <li><strong>EmberJS</strong> por <a target="_blank" href="https://twitter.com/mcortesi5">@mcortesi5</a></li>
+          <li><strong>BackboneJS</strong> por <a target="_blank" href="https://twitter.com/opensas">@opensas</a> y <a target="_blank" href="https://twitter.com/MatiasUrbano">@MatiasUrbano</a></li>
+        </ol>
+      </td>
+    </tr>
+    <tr>
+      <td>16/04/2013</td>
+      <td>
+        <ol>
+          <li><strong>Ruby on Rails</strong> por <a target="_blank" href="https://twitter.com/derfarg">@derfarg</a> y <a target="_blank" href="https://twitter.com/mgonto">@mgonto</a></li>
+          <li><strong>Flask en Raspberry Pi</strong> por <a target="_blank" href="https://twitter.com/DiegoRam">@DiegoRam</a></li>
+          <li><strong>Haml, Jade, Sass, Compass</strong> por <a target="_blank" href="https://twitter.com/minimalart">@minimalart</a> </li>
+        </ol>
+      </td>
+    </tr>
+    <tr>
+      <td>02/03/2013</td>
+      <td><strong>Asado Nardoz de comienzo de año</strong></td>
+    </tr>
+  </tbody>
+</table>
+
+<h3>2012</h3>
+<table class="table table-striped table-bordered">
+  <thead>
+    <tr>
+      <th>Fecha</th>
+      <th>Título</th>
+    </tr>
+  </thead>
+  <tbody>
+    <tr>
+      <td>18/08/2012</td>
+      <td>
+        <strong>Desayuno Nardoz</strong>
+        <ol>
+          <li><strong>SecureSocial</strong> por <a target="_blank" href="https://twitter.com/jaliss">@jaliss</a></li>
+          <li><strong>RaspberryPi</strong> por <a target="_blank" href="https://twitter.com/frodriguez">@frodriguez</a></li>
+        </ol>
+      </td>
+    </tr>
+    <tr>
+      <td>??/07/2012</td>
+      <td><strong>RestOpenGov</strong><br />por <a target="_blank" href="https://twitter.com/alan_reid">@alan_reid</a> y <a target="_blank" href="https://twitter.com/nfmelendez">@nfmelendez</a></td>
+    </tr>
+    <tr>
+      <td>11/05/2012</td>
+      <td>
+        <strong>Hackathon de Gobierno Abierto. Presentación de RestOpenGov</strong><br />
+        por <a target="_blank" href="https://twitter.com/nfmelendez">@nfmelendez</a>, <a target="_blank" href="https://twitter.com/alan_reid">@alan_reid</a>, <a target="_blank" href="https://twitter.com/opensas">@opensas</a> y <a target="_blank" href="https://twitter.com/palamago">@palamago</a>
+      </td>
+    </tr>
+    <tr>
+      <td>05/05/2012</td>
+      <td>
+        <strong>Primer Hackathon de Play Framework 2.0 de Latinoamérica</strong><br />
+        <span class="label label-important">Play Framework Argentina User Group</span>
+      </td>
+    </tr>
+    <tr>
+      <td>27/04/2012</td>
+      <td><strong>Automatización de tareas en múltiples servidores con Puppet</strong><br/>por <a target="_blank" href="https://twitter.com/frodriguez">@frodriguez</a></td>
+    </tr>
+    <tr>
+      <td>09/04/2012</td>
+      <td><strong>Scalable Nardoz: Aplicaciones concurrentes y distribuídas con Akka</strong><br/>por <a target="_blank" href="https://twitter.com/frodriguez">@frodriguez</a></td>
+    </tr>
+    <tr>
+      <td>09/02/2012</td>
+      <td><strong>Introducción a Arduino</strong><br/>por <a target="_blank" href="https://twitter.com/alan_reid">@alan_reid</a></td>
+    </tr>
+  </tbody>
+</table>
+
+
+<h3>2011</h3>
+
+<table class="table table-striped table-bordered">
+  <thead>
+    <tr>
+      <th>Fecha</th>
+      <th>Título</th>
+    </tr>
+  </thead>
+  <tbody>
+    <tr>
+      <td>14/12/2011</td>
+      <td><strong>Cena Nardoz de fin de año</strong></td>
+    </tr>
+    <tr>
+      <td>23/11/2011</td>
+      <td><strong>Nardoz filosófico / Preview de Play Framework 2.0</strong><br/>por <a target="_blank" href="https://twitter.com/opensas">@opensas</a></td>
+    </tr>
+    <tr>
+      <td>11/10/2011</td>
+      <td><strong>Git-flow. Procesamiento distribuído en realtime con Storm</strong><br/>por <a target="_blank" href="https://twitter.com/arjones">@arjones</a></td>
+    </tr>
+    <tr>
+      <td>30/09/2011</td>
+      <td>
+        <strong>Play Framework</strong><br/>
+        por <a target="_blank" href="https://twitter.com/opensas">@opensas</a> y <a target="_blank" href="https://twitter.com/jaliss">@jaliss</a><br />
+        <span class="label label-important">Java User Group Argentina</span>
+      </td>
+    </tr>
+    <tr>
+      <td>09/09/2011</td>
+      <td><strong>Charla previa sobre Play Framework para Java User Group Argentina</strong><br/>por <a target="_blank" href="https://twitter.com/opensas">@opensas</a> y <a target="_blank" href="https://twitter.com/jaliss">@jaliss</a></td>
+    </tr>
+    <tr>
+      <td>17/08/2011</td>
+      <td><strong>Elasticsearch</strong><br/>por <a target="_blank" href="https://twitter.com/arjones">@arjones</a></td>
+    </tr>
+    <tr>
+      <td>04/08/2011</td>
+      <td>
+        <strong>Introducción a Scala</strong><br/>
+        por <a target="_blank" href="https://twitter.com/arjones">@arjones</a><br />
+        <span class="label label-important">Java User Group Argentina</span>
+      </td>
+    </tr>
+    <tr>
+      <td>31/06/2011</td>
+      <td><strong>Java Future calls usando play.F</strong><br/>por <a target="_blank" href="https://twitter.com/cmordue">@cmordue</a></td>
+    </tr>
+    <tr>
+      <td>09/06/2011</td>
+      <td><strong>Nerdeada en Bangalor</strong></td>
+    </tr>
+    <tr>
+      <td>27/04/2011</td>
+      <td><strong>Scala</strong><br/>por <a target="_blank" href="https://twitter.com/arjones">@arjones</a> y <a target="_blank" href="https://twitter.com/cmordue">@cmordue</a> </td>
+    </tr>
+    <tr>
+      <td>07/04/2011</td>
+      <td><strong>Git</strong><br/>por <a target="_blank" href="https://twitter.com/arjones">@arjones</a></td>
+    </tr>
+    <tr>
+      <td>22/03/2011</td>
+      <td><strong>Mockito, Integración Continua</strong><br/>por <a target="_blank" href="https://twitter.com/arjones">@arjones</a></td>
+    </tr>
+    <tr>
+      <td>10/03/2011</td>
+      <td><strong>Node.js</strong><br/>por <a target="_blank" href="https://twitter.com/alan_reid">@alan_reid</a></td>
+    </tr>
+    <tr>
+      <td>wormhole</td>
+      <td><strong>Play Framework, Neo4J, Eurynome</strong></td>
+    </tr>
+    <tr>
+      <td>24/01/2011</td>
+      <td><strong>Primera reunión Nardoz</strong><br />en Bangalore</td>
+    </tr>
+  </tbody>
+</table>
diff --git a/index.md b/index.md
deleted file mode 100644
index 72f1757..0000000
--- a/index.md
+++ /dev/null
@@ -1,86 +0,0 @@
----
-layout: page
-title: Hello World!
-tagline: Supporting tagline
----
-{% include JB/setup %}
-
-
-
-Read [Jekyll Quick Start](http://jekyllbootstrap.com/usage/jekyll-quick-start.html)
-
-Complete usage and documentation available at: [Jekyll Bootstrap](http://jekyllbootstrap.com)
-
-## Update Author Attributes
-
-In `_config.yml` remember to specify your own data:
-
-    title : My Blog =)
-
-    author :
-      name : Name Lastname
-      email : blah@email.test
-      github : username
-      twitter : username
-
-The theme should reference these variables whenever needed.
-
-## Sample Posts
-
-This blog contains sample posts which help stage pages and blog data.
-When you don't need the samples anymore just delete the `_posts/core-samples` folder.
-
-    $ rm -rf _posts/core-samples
-
-Here's a sample "posts list".
-
-<ul class="posts">
-  {% for post in site.posts %}
-    <li><span>{{ post.date | date_to_string }}</span> &raquo; <a href="{{ BASE_PATH }}{{ post.url }}">{{ post.title }}</a></li>
-  {% endfor %}
-</ul>
-
-## To-Do
-
-This theme is still unfinished. If you'd like to be added as a contributor, [please fork](http://github.com/plusjade/jekyll-bootstrap)!
-We need to clean up the themes, make theme usage guides with theme-specific markup examples.
-
-Read [Jekyll Quick Start](http://jekyllbootstrap.com/usage/jekyll-quick-start.html)
-
-Complete usage and documentation available at: [Jekyll Bootstrap](http://jekyllbootstrap.com)
-
-## Update Author Attributes
-
-In `_config.yml` remember to specify your own data:
-
-    title : My Blog =)
-
-    author :
-      name : Name Lastname
-      email : blah@email.test
-      github : username
-      twitter : username
-
-The theme should reference these variables whenever needed.
-
-## Sample Posts
-
-This blog contains sample posts which help stage pages and blog data.
-When you don't need the samples anymore just delete the `_posts/core-samples` folder.
-
-    $ rm -rf _posts/core-samples
-
-Here's a sample "posts list".
-
-<ul class="posts">
-  {% for post in site.posts %}
-    <li><span>{{ post.date | date_to_string }}</span> &raquo; <a href="{{ BASE_PATH }}{{ post.url }}">{{ post.title }}</a></li>
-  {% endfor %}
-</ul>
-
-## To-Do
-
-This theme is still unfinished. If you'd like to be added as a contributor, [please fork](http://github.com/plusjade/jekyll-bootstrap)!
-We need to clean up the themes, make theme usage guides with theme-specific markup examples.
-
-
diff --git a/projects.html b/projects.html
index 570a718..3a7662e 100644
--- a/projects.html
+++ b/projects.html
@@ -4,7 +4,7 @@
 ---
 {% include JB/setup %}
 
-<div class="container-projects">
+<div class="container">
 
   <div class="page-header">
     <h1>{{ page.title }}</h1>
diff --git a/talks.html b/talks.html
index 865544a..da68edf 100644
--- a/talks.html
+++ b/talks.html
@@ -1,193 +1,336 @@
 ---
-layout: page
+layout: default
 title: Talks
 ---
 {% include JB/setup %}
 
+<div class="container">
+  <div class="page-header">
+    <h1>Talks</h1>
+  </div>
 
+  <h3>2015</h3>
+  <table class="table table-striped table-bordered">
+    <thead>
+      <tr>
+        <th>Fecha</th>
+        <th>Título</th>
+      </tr>
+    </thead>
+    <tbody>
+      <tr>
+        <td>02/07/2015</td>
+        <td>
+          <strong>Nardoz de Rust</strong> 
+          <ol>
+            <li><strong>Conceptos principales y diferenciales</strong> por <a href="https://twitter.com/nfmelendez">@nfmelendez</a></li>
+            <li><strong>Construir una Base de Datos en Rust</strong> por <a href="https://twitter.com/seppo0010">@seppo0010</a></li>
+          </ol>
+        </td>
+      </tr>
+      <tr>
+        <td>20/06/2015</td>
+        <td>
+          <strong>HackDay: Data visualizations with Twitter data V2</strong>
+        </td>
+      </tr>
+    </tbody>
+  </table>
 
-<h3>Año 2013</h3>
-<table class="table table-striped table-bordered">
-  <thead>
-    <tr>
-      <th>Fecha</th>
-      <th>Título</th>
-    </tr>
-  </thead>
-  <tbody>
-    <tr>
-      <td>19/06/2013</td>
-      <td>
-        <strong>Real World Akka Recipes</strong> por Jamie Allen<br />
-        <span class="label label-important">Buenos Aires High Scalability Group</span>
-      </td>
-    </tr>
-    <tr>
-      <td>17/06/2013</td>
-      <td>
-        <strong>Effective Akka</strong> por Jamie Allen<br />
-        <span class="label label-important">Scala User Group Argentina</span>
+  <h3>2014</h3>
+  <table class="table table-striped table-bordered">
+    <thead>
+      <tr>
+        <th>Fecha</th>
+        <th>Título</th>
+      </tr>
+    </thead>
+    <tbody>
+      <tr>
+        <td>23/09/2014</td>
+        <td>
+          <strong>Edge.js</strong> por <a href="https://twitter.com/tjanczuk">@tjanczuk</a>
+        </td>
+      </tr>
+      <tr>
+        <td>20/09/2014</td>
+        <td>
+          <strong>HackDay: Data visualizations with Twitter data</strong>
+        </td>
+      </tr>
+      <tr>
+        <td>13/08/2014</td>
+        <td>
+          <strong>Apache Spark: Un framework de procesamiento rápido a gran escala</strong> por <a href="https://twitter.com/arjones">@arjones</a>
+        </td>
+      </tr>
+      <tr>
+        <td>14/05/2014</td>
+        <td>
+          <strong>Criptonardoz: Introducción a la criptografía</strong> por <a href="https://twitter.com/quixote_arg">@quixote_arg</a>
+        </td>
+      </tr>
+      <tr>
+        <td>24/04/2014</td>
+        <td>
+          <strong>Nardoz de Escalabilidad de Juegos Masivos con Google Cloud</strong> por <a href="https://twitter.com/hernanliendo">@hernanliendo</a>
+        </td>
+      </tr>
+      <tr>
+        <td>25/02/2014</td>
+        <td>
+          <strong>Nardoz de Criptomonedas</strong> por <a href="https://twitter.com/maraoz">@maraoz</a>
+        </td>
+      </tr>
+      <tr>
+        <td>17/02/2014</td>
+        <td>
+          <strong>Where's my straw? What does a drive-thru have to teach us about optimization of tools and processes?</strong> por <a href="https://twitter.com/getify">@getify</a>
+        </td>
+     </tr>
+    </tbody>
+  </table>
 
-      </td>
-    </tr>
-    <tr>
-      <td>30/05/2013</td>
-      <td>
-        <strong>Nardoz do diablo: Javascript Framework Battle</strong>
-        <ol>
-          <li><strong>AngularJS</strong> por Martin Gontovnikas</li>
-          <li><strong>EmberJS</strong> por Mariano Cortesi</li>
-          <li><strong>BackboneJS</strong> por Sebastián Scarano y Matías Urbano</li>
-        </ol>
-      </td>
-    </tr>
-    <tr>
-      <td>16/04/2013</td>
-      <td>
-        <ol>
-          <li><strong>Ruby on Rails</strong> por Pablo Rodriguez y Martin Gontovnikas</li>
-          <li><strong>Flask en Raspberry Pi</strong> por Diego Ramirez</li>
-          <li><strong>Haml, Jade, Sass, Compass</strong> por Max Kraszewski </li>
-        </ol>
-      </td>
-    </tr>
-    <tr>
-      <td>02/03/2013</td>
-      <td><strong>Asado Nardoz de comienzo de año</strong></td>
-    </tr>
-  </tbody>
-</table>
+  <h3>2013</h3>
+  <table class="table table-striped table-bordered">
+    <thead>
+      <tr>
+        <th>Fecha</th>
+        <th>Título</th>
+      </tr>
+    </thead>
+    <tbody>
+       <tr>
+          <td>17/12/2013</td>
+          <td>
+            <strong>Asado de fin de año</strong> 
+          </td>
+       </tr>
+      <tr>
+        <td>04/12/2013</td>
+        <td>
+          <strong>Nardoz de UI/UX: Elementos de diseño de interfaces</strong> por <a href="https://twitter.com/pixelbeat">@pixelbeat</a>
+        </td>
+     </tr>
+      <tr>
+        <td>13/11/2013</td>
+        <td>
+          <strong>Nardoz de virtualización</strong>
+          <ol>
+            <li><strong>Vagrant: Creando ambientes de desarrollo aislados y replicables</strong> <br />por <a href="https://twitter.com/guidomb">@guidomb</a></li>
+            <li><strong>Docker</strong> por <a href="https://twitter.com/frodriguez">@frodriguez</a></li>
+          </ol>
+        </td>
+     </tr>
+      <tr>
+        <td>05/10/2013</td>
+        <td>
+          <strong>Coffeescript &amp; Backbone + Q&amp;A</strong> por <a href="https://twitter.com/jashkenas">@jashkenas</a> (Creador de Backbone, Coffescript y Underscore)<br />
+        </td>
+      </tr>
+      <tr>
+        <td>03/10/2013</td>
+        <td>
+          <strong>DIY Electronics</strong>
+          <ol>
+          <li><strong>Kiwi: Estaciones de bicicletas automatizadas (Arduino + RaspberryPi)</strong> <br />por <a href="https://twitter.com/alan_reid">@alan_reid</a> &amp; Ignacio Orlandini</li>
+            <li><strong>Quadcopter y bot con Arduino</strong> por <a href="https://twitter.com/arjones">@arjones</a> y <a href="https://twitter.com/saientzg">@saientzg</a></li>
+            <li><strong>ElBraian: Bot autónomo con RaspberryPi</strong> por <a href="https://twitter.com/DiegoRam">@DiegoRam</a></li>
+          </ol>
+        </td>
+     </tr>
+     <tr>
+        <td>24/07/2013</td>
+        <td>
+          <strong>Nardoz Mobile</strong>
+          <ol>
+            <li><strong>iOS, Android, BlackBerry</strong> por <a href="https://twitter.com/f0go">@f0go</a></li>
+            <li><strong>FirefoxOS</strong> por <a href="https://twitter.com/deimidis">@deimidis</a></li>
+          </ol>
+          <u>Invitados especiales:</u>
+          <ul>
+            <li>Diana Livits (Relationship Marketing Manager, Mozilla)</li>
+            <li>Mark Cranson (Mobile Business Development, Mozilla)</li>
+            <li>Patrick Hundal (Technical Business Development, Mozilla)</li>
+          </ul>
+        </td>
+      </tr>
+      <tr>
+        <td>19/06/2013</td>
+        <td>
+          <strong>Real World Akka Recipes</strong> por <a href="https://twitter.com/jamie_allen">@jamie_allen</a> (Director of Consulting, Typesafe)<br />
+          <span class="label label-important">Buenos Aires High Scalability Group</span>
+        </td>
+      </tr>
+      <tr>
+        <td>17/06/2013</td>
+        <td>
+          <strong>Effective Akka</strong> por <a href="https://twitter.com/jamie_allen">@jamie_allen</a> (Director of Consulting, Typesafe)<br />
+          <span class="label label-important">Scala User Group Argentina</span>
 
-<h3>Año 2012</h3>
-<table class="table table-striped table-bordered">
-  <thead>
-    <tr>
-      <th>Fecha</th>
-      <th>Título</th>
-    </tr>
-  </thead>
-  <tbody>
-    <tr>
-      <td>18/08/2012</td>
-      <td>
-        <strong>Desayuno Nardoz</strong>
-        <ol>
-          <li><strong>SecureSocial</strong> por Jorge Aliss</li>
-          <li><strong>RaspberryPi</strong> por Fernando Rodriguez Olivera</li>
-        </ol>
-      </td>
-    </tr>
-    <tr>
-      <td>??/07/2012</td>
-      <td><strong>RestOpenGov</strong><br />por Alan Reid y Nicolás Melendez</td>
-    </tr>
-    <tr>
-      <td>11/05/2012</td>
-      <td>
-        <strong>Hackathon de Gobierno Abierto. Presentación de RestOpenGov</strong><br />
-        por Nicolás Melendez, Alan Reid, Sebastián Scarano y Pablo Paladino
-      </td>
-    </tr>
-    <tr>
-      <td>05/05/2012</td>
-      <td>
-        <strong>Primer Hackathon de Play Framework 2.0 de Latinoamérica</strong><br />
-        <span class="label label-important">Play Framework Argentina User Group</span>
-      </td>
-    </tr>
-    <tr>
-      <td>27/04/2012</td>
-      <td><strong>Automatización de tareas en múltiples servidores con Puppet</strong><br/>por Fernando Rodriguez Olivera</td>
-    </tr>
-    <tr>
-      <td>09/04/2012</td>
-      <td><strong>Scalable Nardoz: Aplicaciones concurrentes y distribuídas con Akka</strong><br/>por Fernando Rodriguez Olivera</td>
-    </tr>
-    <tr>
-      <td>09/02/2012</td>
-      <td><strong>Introducción a Arduino</strong><br/>por Alan Reid</td>
-    </tr>
-  </tbody>
-</table>
+        </td>
+      </tr>
+      <tr>
+        <td>30/05/2013</td>
+        <td>
+          <strong>Nardoz do diablo: Javascript Framework Battle</strong>
+          <ol>
+            <li><strong>AngularJS</strong> por <a href="https://twitter.com/mgonto">@mgonto</a></li>
+            <li><strong>EmberJS</strong> por <a href="https://twitter.com/mcortesi5">@mcortesi5</a></li>
+            <li><strong>BackboneJS</strong> por <a href="https://twitter.com/opensas">@opensas</a> y <a href="https://twitter.com/MatiasUrbano">@MatiasUrbano</a></li>
+          </ol>
+        </td>
+      </tr>
+      <tr>
+        <td>16/04/2013</td>
+        <td>
+          <ol>
+            <li><strong>Ruby on Rails</strong> por <a href="https://twitter.com/derfarg">@derfarg</a> y <a href="https://twitter.com/mgonto">@mgonto</a></li>
+            <li><strong>Flask en Raspberry Pi</strong> por <a href="https://twitter.com/DiegoRam">@DiegoRam</a></li>
+            <li><strong>Haml, Jade, Sass, Compass</strong> por <a href="https://twitter.com/minimalart">@minimalart</a> </li>
+          </ol>
+        </td>
+      </tr>
+      <tr>
+        <td>02/03/2013</td>
+        <td><strong>Asado Nardoz de comienzo de año</strong></td>
+      </tr>
+    </tbody>
+  </table>
 
+  <h3>2012</h3>
+  <table class="table table-striped table-bordered">
+    <thead>
+      <tr>
+        <th>Fecha</th>
+        <th>Título</th>
+      </tr>
+    </thead>
+    <tbody>
+      <tr>
+        <td>18/08/2012</td>
+        <td>
+          <strong>Desayuno Nardoz</strong>
+          <ol>
+            <li><strong>SecureSocial</strong> por <a href="https://twitter.com/jaliss">@jaliss</a></li>
+            <li><strong>RaspberryPi</strong> por <a href="https://twitter.com/frodriguez">@frodriguez</a></li>
+          </ol>
+        </td>
+      </tr>
+      <tr>
+        <td>??/07/2012</td>
+        <td><strong>RestOpenGov</strong><br />por <a href="https://twitter.com/alan_reid">@alan_reid</a> y <a href="https://twitter.com/nfmelendez">@nfmelendez</a></td>
+      </tr>
+      <tr>
+        <td>11/05/2012</td>
+        <td>
+          <strong>Hackathon de Gobierno Abierto. Presentación de RestOpenGov</strong><br />
+          por <a href="https://twitter.com/nfmelendez">@nfmelendez</a>, <a href="https://twitter.com/alan_reid">@alan_reid</a>, <a href="https://twitter.com/opensas">@opensas</a> y <a href="https://twitter.com/palamago">@palamago</a>
+        </td>
+      </tr>
+      <tr>
+        <td>05/05/2012</td>
+        <td>
+          <strong>Primer Hackathon de Play Framework 2.0 de Latinoamérica</strong><br />
+          <span class="label label-important">Play Framework Argentina User Group</span>
+        </td>
+      </tr>
+      <tr>
+        <td>27/04/2012</td>
+        <td><strong>Automatización de tareas en múltiples servidores con Puppet</strong><br/>por <a href="https://twitter.com/frodriguez">@frodriguez</a></td>
+      </tr>
+      <tr>
+        <td>09/04/2012</td>
+        <td><strong>Scalable Nardoz: Aplicaciones concurrentes y distribuídas con Akka</strong><br/>por <a href="https://twitter.com/frodriguez">@frodriguez</a></td>
+      </tr>
+      <tr>
+        <td>09/02/2012</td>
+        <td><strong>Introducción a Arduino</strong><br/>por <a href="https://twitter.com/alan_reid">@alan_reid</a></td>
+      </tr>
+    </tbody>
+  </table>
 
-<h3>Año 2011</h3>
 
-<table class="table table-striped table-bordered">
-  <thead>
-    <tr>
-      <th>Fecha</th>
-      <th>Título</th>
-    </tr>
-  </thead>
-  <tbody>
-    <tr>
-      <td>14/12/2011</td>
-      <td><strong>Cena Nardoz de fin de año</strong></td>
-    </tr>
-    <tr>
-      <td>23/11/2011</td>
-      <td><strong>Nardoz filosófico / Preview de Play Framework 2.0</strong><br/>por Sebastián Scarano</td>
-    </tr>
-    <tr>
-      <td>11/10/2011</td>
-      <td><strong>Git-flow. Procesamiento distribuído en realtime con Storm</strong><br/>por Gustavo Arjones</td>
-    </tr>
-    <tr>
-      <td>30/09/2011</td>
-      <td>
-        <strong>Play Framework</strong><br/>
-        por Sebastián Scarano y Jorge Aliss<br />
-        <span class="label label-important">Java User Group Argentina</span>
-      </td>
-    </tr>
-    <tr>
-      <td>09/09/2011</td>
-      <td><strong>Charla previa sobre Play Framework para Java User Group Argentina</strong><br/>por Sebastián Scarano y Jorge Aliss</td>
-    </tr>
-    <tr>
-      <td>17/08/2011</td>
-      <td><strong>Elasticsearch</strong><br/>por Gustavo Arjones</td>
-    </tr>
-    <tr>
-      <td>04/08/2011</td>
-      <td>
-        <strong>Introducción a Scala</strong><br/>
-        por Gustavo Arjones<br />
-        <span class="label label-important">Java User Group Argentina</span>
-      </td>
-    </tr>
-    <tr>
-      <td>31/06/2011</td>
-      <td><strong>Java Future calls usando play.F</strong><br/>por Chris Mordue</td>
-    </tr>
-    <tr>
-      <td>09/06/2011</td>
-      <td><strong>Nerdeada en Bangalor</strong></td>
-    </tr>
-    <tr>
-      <td>27/04/2011</td>
-      <td><strong>Scala</strong><br/>por Gustavo Arjones y Chris Mordue </td>
-    </tr>
-    <tr>
-      <td>07/04/2011</td>
-      <td><strong>Git</strong><br/>por Gustavo Arjones</td>
-    </tr>
-    <tr>
-      <td>22/03/2011</td>
-      <td><strong>Mockito, Integración Continua</strong><br/>por Gustavo Arjones</td>
-    </tr>
-    <tr>
-      <td>10/03/2011</td>
-      <td><strong>Node.js</strong><br/>por Alan Reid</td>
-    </tr>
-    <tr>
-      <td>wormhole</td>
-      <td><strong>Play Framework, Neo4J, Eurynome</strong></td>
-    </tr>
-    <tr>
-      <td>24/01/2011</td>
-      <td><strong>Primera reunión Nardoz</strong><br />en Bangalore</td>
-    </tr>
-  </tbody>
-</table>
+  <h3>2011</h3>
+
+  <table class="table table-striped table-bordered">
+    <thead>
+      <tr>
+        <th>Fecha</th>
+        <th>Título</th>
+      </tr>
+    </thead>
+    <tbody>
+      <tr>
+        <td>14/12/2011</td>
+        <td><strong>Cena Nardoz de fin de año</strong></td>
+      </tr>
+      <tr>
+        <td>23/11/2011</td>
+        <td><strong>Nardoz filosófico / Preview de Play Framework 2.0</strong><br/>por <a href="https://twitter.com/opensas">@opensas</a></td>
+      </tr>
+      <tr>
+        <td>11/10/2011</td>
+        <td><strong>Git-flow. Procesamiento distribuído en realtime con Storm</strong><br/>por <a href="https://twitter.com/arjones">@arjones</a></td>
+      </tr>
+      <tr>
+        <td>30/09/2011</td>
+        <td>
+          <strong>Play Framework</strong><br/>
+          por <a href="https://twitter.com/opensas">@opensas</a> y <a href="https://twitter.com/jaliss">@jaliss</a><br />
+          <span class="label label-important">Java User Group Argentina</span>
+        </td>
+      </tr>
+      <tr>
+        <td>09/09/2011</td>
+        <td><strong>Charla previa sobre Play Framework para Java User Group Argentina</strong><br/>por <a href="https://twitter.com/opensas">@opensas</a> y <a href="https://twitter.com/jaliss">@jaliss</a></td>
+      </tr>
+      <tr>
+        <td>17/08/2011</td>
+        <td><strong>Elasticsearch</strong><br/>por <a href="https://twitter.com/arjones">@arjones</a></td>
+      </tr>
+      <tr>
+        <td>04/08/2011</td>
+        <td>
+          <strong>Introducción a Scala</strong><br/>
+          por <a href="https://twitter.com/arjones">@arjones</a><br />
+          <span class="label label-important">Java User Group Argentina</span>
+        </td>
+      </tr>
+      <tr>
+        <td>31/06/2011</td>
+        <td><strong>Java Future calls usando play.F</strong><br/>por <a href="https://twitter.com/cmordue">@cmordue</a></td>
+      </tr>
+      <tr>
+        <td>09/06/2011</td>
+        <td><strong>Nerdeada en Bangalor</strong></td>
+      </tr>
+      <tr>
+        <td>27/04/2011</td>
+        <td><strong>Scala</strong><br/>por <a href="https://twitter.com/arjones">@arjones</a> y <a href="https://twitter.com/cmordue">@cmordue</a> </td>
+      </tr>
+      <tr>
+        <td>07/04/2011</td>
+        <td><strong>Git</strong><br/>por <a href="https://twitter.com/arjones">@arjones</a></td>
+      </tr>
+      <tr>
+        <td>22/03/2011</td>
+        <td><strong>Mockito, Integración Continua</strong><br/>por <a href="https://twitter.com/arjones">@arjones</a></td>
+      </tr>
+      <tr>
+        <td>10/03/2011</td>
+        <td><strong>Node.js</strong><br/>por <a href="https://twitter.com/alan_reid">@alan_reid</a></td>
+      </tr>
+      <tr>
+        <td>wormhole</td>
+        <td><strong>Play Framework, Neo4J, Eurynome</strong></td>
+      </tr>
+      <tr>
+        <td>24/01/2011</td>
+        <td><strong>Primera reunión Nardoz</strong><br />en Bangalore</td>
+      </tr>
+    </tbody>
+  </table>
+
+  
+</div>