From: Molly de Blanc <molly@fsf.org>
Date: Fri, 9 Mar 2018 17:55:08 +0000 (-0500)
Subject: updated vios.
X-Git-Url: https://vcs.fsf.org/?a=commitdiff_plain;h=0a9aab503dac1e0c7398c2afbf90a53566c1e759;p=libreplanet-static.git

updated vios.
---

0a9aab503dac1e0c7398c2afbf90a53566c1e759
diff --cc 2018/includes/generated-bios.html
index 3fc66655,e2b8445e..f51eebd3
--- a/2018/includes/generated-bios.html
+++ b/2018/includes/generated-bios.html
@@@ -740,14 -778,13 +778,15 @@@ symbolic debugger (gdb), GNU Emacs, an
  </div> <!-- speaker-40 img column end -->
  <!-- speaker-40 content column start -->
  <div class="col-md-10 col-sm-9 col-xs-8">
- <header class="speaker-header" id="metts">
+ <header class="speaker-header" id="mcgovern">
  <hgroup>
- <h2>Micky Metts</h2>
+ <h2>Neil McGovern</h2>
  </hgroup>
  </header>
 +<a href="http://creativecommons.org/publicdomain/zero/1.0/" rel="license">
 +<img alt="CC0" src="http://i.creativecommons.org/p/zero/1.0/88x31.png" style="border-style: none;"/> </a> <br/>
- <p>Micky Metts is an owner of Agaric, a worker-owned technology cooperative. Activist Hacker – Industry Organizer – Public Speaker – Connector – Advisor and Visionary. Micky is a member of the MayFirst People Link Leadership Committee and is a liaison between the Solidarity Economy Network (SEN) and The United States Federation of Worker Cooperatives (USFWC), with an intention to bring communities together.  Micky is also a founding member of a cohort that is building a New Boston Public High School based in cooperative learning - BoCoLab. She is a member of FSF.org and Drupal.org, a community based on free software. She is a published author contributing to the book, <em>Ours to Hack and to Own</em>, one of the top technology books of 2017 in Wired magazine. Micky grew up in Weston, CT, and now lives in Boston, MA.</p>
+ <p>A long-term contributor to free software, Neil McGovern has held posts on the boards of Software in the Public Interest, Open Rights Group and served a term as the Debian Project Leader. Neil currently works as the Executive Director of the GNOME Foundation.</p>
+ <p><em>(Copyright © 2016 Guy Lunardi. Photos licensed under <a href="https://creativecommons.org/licenses/by-sa/4.0/">CC BY-SA 4.0</a>.)</em></p>
  </div> <!-- speaker-40 content column end -->
  </div> <!-- speaker-40 row end -->
  </section>
@@@ -826,20 -877,13 +879,19 @@@
  </section>
  <section class="speaker-block" id="lp-speaker-46">
  <div class="row"> <!-- speaker-46 row start -->
- <!-- speaker-46 img column start -->
- <div class="col-md-2 col-sm-3 col-xs-4">
- <img alt="[ Chris Thompson ]" class="img-responsive" src="https://static.fsf.org/nosvn/libreplanet/2018/chris-thompson-200x200-c-wolcen-cc0-1-0.png"/>
- </div> <!-- speaker-46 img column end -->
  <!-- speaker-46 content column start -->
- <div class="col-md-10 col-sm-9 col-xs-8">
- <header class="speaker-header" id="thompson">
+ <div class="col-md-offset-2 col-sm-offset-3 col-xs-offset-4 col-md-10 col-sm-9 col-xs-8">
+ <header class="speaker-header" id="solver">
  <hgroup>
- <h2>Chris Thompson</h2>
+ <h2>Connor Solver</h2>
  </hgroup>
  </header>
++<<<<<<< HEAD
 +<a href="http://creativecommons.org/publicdomain/zero/1.0/">
 +<img alt="CC0" src="http://i.creativecommons.org/p/zero/1.0/88x31.png"> </a> </ <br/>
 +<p>Chris Thompson is a member of Agaric and has worked in a variety of technical leadership roles for over the past two decades (and some), after first discovering his talent for programming while hacking BASIC programs at the age of 12. He returned to programming as a career - his first programming position utilizing Visual Basic - where he proved himself capable of tackling some of the most challenging obstacles. While Chris has spent more than a little time writing high-performance stored procedures for large databases, he also feels right at home in the web world; Whether the server runs in Zend(PHP), OpenJava, or Mono(C#/.Net) and the client uses Angular.JS, Knockout.JS, or raw JavaScript.</p>
++=======
++>>>>>>> master
  </div> <!-- speaker-46 content column end -->
  </div> <!-- speaker-46 row end -->
  </section>
@@@ -901,20 -958,14 +966,20 @@@
  </section>
  <section class="speaker-block" id="lp-speaker-51">
  <div class="row"> <!-- speaker-51 row start -->
- <!-- speaker-51 img column start -->
- <div class="col-md-2 col-sm-3 col-xs-4">
- <img alt="[ Jeffrey Warren ]" class="img-responsive" src="https://static.fsf.org/nosvn/libreplanet/2018/"/>
- </div> <!-- speaker-51 img column end -->
  <!-- speaker-51 content column start -->
- <div class="col-md-10 col-sm-9 col-xs-8">
- <header class="speaker-header" id="warren">
+ <div class="col-md-offset-2 col-sm-offset-3 col-xs-offset-4 col-md-10 col-sm-9 col-xs-8">
+ <header class="speaker-header" id="villa">
  <hgroup>
- <h2>Jeffrey Warren</h2>
+ <h2>Luis Villa</h2>
  </hgroup>
  </header>
++<<<<<<< HEAD
 +<p>The creator of GrassrootsMapping.org <a href="http://grassrootsmapping.org/">http://grassrootsmapping.org"/</a> and co-founder and Research Director for Public Lab, Jeffrey Warren designs mapping and civic science tools and professionally flies balloons and kites. Notable software he has created include the vector-mapping framework Cartagen <a href="http://cartagen.org/">http://cartagen.org/</a> and orthorectification tool MapKnitter<a href="http://mapknitter.org/">http://mapknitter.org/</a>, as well as open spectral database and toolkit Spectral Workbench <a href="http://spectralworkbench.org/">http://spectralworkbench.org/</a>.</p>
 +<p>He served from 2015–17 as Vice President of the board <a href="http://www.oshwa.org/2013/09/10/welcome-new-oshwa-board-members/">http://www.oshwa.org/2013/09/10/welcome-new-oshwa-board-members/"</a> of the Open Source Hardware Association <a href="http://www.oshwa.org/">http://www.oshwa.org/"</a>, is on the board of alternative education program Parts and Crafts <a href="http://partsandcrafts.org/">http://partsandcrafts.org/"</a> in Somerville MA, and an advocate of free software, hardware, and data. He co-founded Vestal Design, a graphic/interaction design firm in 2004, and directed the Cut&amp;Paste Labs project, a year-long series of workshops on open source tools and web design in 2006-7 with Lima designer Diego Rotalde.</p>
 +<p>Jeff holds an MS from MIT and a BA in Architecture from Yale University, and spent much of that time working with artist/technologist Natalie Jeremijenko, building robotic dogs and stuff. To find out more, visit Unterbahn.com.</p>
++=======
+ <p>Luis is an attorney, programmer, and entrepreneur who has been involved in free software his entire career. He is currently the co-founder of Tidelift. Previous roles include Senior Director of Community Engagement at the Wikimedia Foundation; legal fellow at Mozilla, where he led the drafting of version 2.0 of the Mozilla Public License; and associate at Greenberg Traurig, where he represented Google in the Google-Oracle case. Before practicing law, he was the bugmaster and a board member of the GNOME Foundation, and worked at Ximian. He also briefly maintained a GPL-licensed Lego Mindstorms operating system.</p>
++>>>>>>> master
  </div> <!-- speaker-51 content column end -->
  </div> <!-- speaker-51 row end -->
  </section>