Merge branch 'gh-pages' into develop

This commit is contained in:
Ben Morrow 2017-06-02 10:12:44 -07:00
commit db4d390ed8
1 changed files with 6 additions and 6 deletions

View File

@ -306,42 +306,42 @@
<div class="judge-picture"><!--img src="img/judges/iuri-matias.jpeg" /--></div>
<h3 class="judge-title">Iuri Matias</h3>
</div>
<div class="judge-text">Developer of Embark,<br />a framework for Ethereum DApps</div>
<div class="judge-text">Creator of Embark</div>
</div>
<div class="judge-item judge-carolyn">
<div class="judge-top">
<div class="judge-picture"><!--img src="img/judges/carolyn-reckhow.jpg" /--></div>
<h3 class="judge-title">Carolyn Reckhow</h3>
</div>
<div class="judge-text">Director of Operations, Consensys</div>
<div class="judge-text">Director of Operations at Consensys</div>
</div>
<div class="judge-item judge-alex">
<div class="judge-top">
<div class="judge-picture"><!--img src="img/judges/alex-van-de-sande.jpeg" /--></div>
<h3 class="judge-title">Alex Van De Sande</h3>
</div>
<div class="judge-text">UX designer, Ethereum Foundation<br />&amp; Lead, Mist</div>
<div class="judge-text">Co-Creator of Mist and<br />ENS at Ethereum Foundation</div>
</div>
<div class="judge-item judge-xin">
<div class="judge-top">
<div class="judge-picture"><!--img src="img/judges/xin-xu.jpg" /--></div>
<h3 class="judge-title">Xin Xu</h3>
</div>
<div class="judge-text">Founder, EthFans</div>
<div class="judge-text">Co-Creator of ETHFans</div>
</div>
<div class="judge-item judge-jorge">
<div class="judge-top">
<div class="judge-picture"><!--img src="img/judges/jorge-izquierdo.jpg" /--></div>
<h3 class="judge-title">Jorge Izquierdo</h3>
</div>
<div class="judge-text">Founder, Aragon</div>
<div class="judge-text">Co-Founder of Aragon</div>
</div>
<div class="judge-item judge-ben">
<div class="judge-top">
<div class="judge-picture"><!--img src="img/judges/ben-morrow.jpg" /--></div>
<h3 class="judge-title">Ben Morrow</h3>
</div>
<div class="judge-text">Community Organizer, Status</div>
<div class="judge-text">Community Organizer at Status</div>
</div>
</div>
</div>