Browse Source

linked commotion wireless

chootka 9 years ago
parent
commit
c8af57120e

BIN
.DS_Store


+ 4 - 0
_site/assets/themes/bootstrap-3/css/style.css

@@ -403,6 +403,10 @@ header h1 {
   margin-bottom: 20px;
 }
 
+a .title {
+  color: #fff;
+}
+
 /* MISC */
 .clearfix:after {
   display: block;

+ 61 - 50
_site/program/index.html

@@ -119,16 +119,22 @@
 		<tr>
 			<td>10:30 - 11:15</td>
 			<td>
-				‘This band is your band, this band is my band...’</br>
-				<a href="../speakers/rachel-odwyer">Rachel Dwyer</a>
+				<a href="../speakers/rachel-odwyer">
+					<span class="title">‘This band is your band, this band is my band...’</span></br>
+					Rachel Dwyer
+				</a>
 			</td>
 			<td>
-				NYC Mesh, a community owned Wi-Fi network</br>
-				<a href="../speakers/brian-hall">Brian Hall</a>, <a href="../speakers/julien-deswaef">Julien Deswaef</a>, <a href="../speakers/dan-grinkevich">Dan Grinkevich</a>
+				<a href="../speakers/brian-hall">
+					<span class="title">NYC Mesh, a community owned Wi-Fi network</span></br>
+					Brian Hall
+				</a>, <a href="../speakers/julien-deswaef">Julien Deswaef</a>, <a href="../speakers/dan-grinkevich">Dan Grinkevich</a>
 			</td>
 			<td class="workshop" rowspan="2">
-				Ways of Seeing: Visualizing Networks Workshop</br>
-				<a href="../speakers/dawn-walker">Dawn Walker</a>
+				<a href="../speakers/dawn-walker">
+					<span class="title">Ways of Seeing: Visualizing Networks Workshop</span></br>
+					Dawn Walker
+				</a>
 			</td>
 			<td></td>
 			<td></td>
@@ -136,11 +142,11 @@
 		<tr>
 			<td>11:30 - 12:00</td>
 			<td>
-				Eccentric WiFi: Networks with others</br>
+				<span class="title">Eccentric WiFi: Networks with others</span></br>
 				<a href="../speakers/tega-brain">Tega Brain</a>
 			</td>
 			<td>
-				Over the top networks, a history of building new systems on the wreckage of the old</br>
+				<span class="title">Over the top networks, a history of building new systems on the wreckage of the old</span></br>
 				<a href="../speakers/edward-vielmetti">Edward Vielmetti</a>
 			</td>
 			<td></td>
@@ -157,19 +163,19 @@
 		<tr>
 			<td>13:00 - 13:30</td>
 			<td>
-				SDR-101 : The Hitchhiker's Guide to the RF Spectrum</br>
+				<span class="title">SDR-101 : The Hitchhiker's Guide to the RF Spectrum</span></br>
 				<a href="../speakers/surya-mattu">Surya Mattu</a>
 			</td>
 			<td>
-				The Importance of Soft Infrastructure</br>
+				<span class="title">The Importance of Soft Infrastructure</span></br>
 				<a href="../speakers/chris-fussner">Chris Fussner</a> + <a href="../speakers/noah-emrich">Noah Emrich</a>
 			</td>
 			<td class="workshop" rowspan="6">
-				How was your day? Ambient Networks Workshop</br>
+				<span class="title">How was your day? Ambient Networks Workshop</span></br>
 				<a href="../speakers/carrie-kengle">Carrie Kengle</a> + <a href="../speakers/bruno-kruse">Bruno Kruse</a>
 			</td>
 			<td class="workshop" rowspan="6">
-				Packet Radio Networks Workshop</br>
+				<span class="title">Packet Radio Networks Workshop</span></br>
 				<a href="../speakers/dennis-de-bel">Dennis de Bel</a> + <a href="../speakers/roel-roscam-abbing">Roel Roscam Abbing</a>
 			</td>
 			<td></td>
@@ -177,11 +183,11 @@
 		<tr>
 			<td>13:40 - 14:40</td>
 			<td>
-				I Will Follow You Into the Dark[net]</br>
+				<span class="title">I Will Follow You Into the Dark[net]</span></br>
 				<a href="../speakers/david-huerta">David Huerta</a> + <a href="../speakers/caroline-sinders">Caroline Sinders</a> + <a href="../speakers/stephanie-hyland">Stephanie Hyland</a>
 			</td>
 			<td>
-				A History of the Future of Solarpunk Ham Radio Club</br>
+				<span class="title">A History of the Future of Solarpunk Ham Radio Club</span></br>
 				<a href="../speakers/adam-rothstein">Adam Rothstein</a> + <a href="../speakers/rob-ray">Rob Ray</a>
 			</td>
 			<td></td>
@@ -189,11 +195,11 @@
 		<tr>
 			<td>14:50 - 15:30</td>
 			<td>
-				Ghost Networks</br>
+				<span class="title">Ghost Networks</span></br>
 				<a href="../speakers/ingrid-burrington">Ingrid Burrington</a>
 			</td>
 			<td>
-				Appropriating Technologies for Protests of Futures</br>
+				<span class="title">Appropriating Technologies for Protests of Futures</span></br>
 				<a href="../speakers/pedro-oliveria">Pedro Oliveria</a>
 			</td>
 			<td></td>
@@ -207,15 +213,15 @@
 		<tr>
 			<td>16:00 - 16:30</td>
 			<td>
-				MAC as a Place and Landscape</br>
+				<span class="title">MAC as a Place and Landscape</span></br>
 				<a href="../speakers/garry-ing">Garry Ing</a>
 			</td>
 			<td>
-				Democracy Through Grassroot Local Networks</br>
+				<span class="title">Democracy Through Grassroot Local Networks</span></br>
 				<a href="../speakers/joe-chasinga">Joe Chasinga</a>
 			</td>
 			<td class="workshop" rowspan="5">
-				There Is No Cloud: Dumping Dropbox to Create a Personal Anti-Cloud For Cheap (Workshop)</br>
+				<span class="title">Workshop: There Is No Cloud: Dumping Dropbox to Create a Personal Anti-Cloud For Cheap</span></br>
 				<a href="../speakers/joshua-kopstein">Joshua Kopstein</a>
 			</td>
 		</tr>
@@ -223,18 +229,18 @@
 			<td>16:40 - 17:00</td>
 			<td>Dan Phiffer</td>
 			<td>
-				Public transportation GPS Tracking</br>
+				<span class="title">Public transportation GPS Tracking</span></br>
 				<a href="../speakers/epic-jefferson">Epic Jefferson</a>
 			</td>
 		</tr>
 		<tr>
 			<td>17:10 - 17:40</td>
 			<td rowspan="2">
-				GSM For Good</br>
+				<span class="title">GSM For Good</span></br>
 				<a href="../speakers/benedetta-piantella">Benedetta Piantella</a>
 			</td>
 			<td>
-				Bibliotecha</br>
+				<span class="title">Bibliotecha</span></br>
 				<a href="../speakers/andre-castro">Andre Castro</a>, <a href="../speakers/lucia-dossin">Lucia Dossin</a>
 			</td>
 			<td></td>
@@ -249,7 +255,7 @@
 		<tr>
 			<td>18:20 - 18:50</td>
 			<td>
-				Security &amp; Privacy in Mesh Networks</br>
+				<span class="title">Security &amp; Privacy in Mesh Networks</span></br>
 				<a href="../speakers/paige-peterson">Paige Peterson</a>
 			</td>
 			<td></td>
@@ -298,29 +304,31 @@
 		<tr>
 			<td>10:30 - 11:20</td>
 			<td>
-				On being the alternative in the absence of alternatives</br>
+				<span class="title">On being the alternative in the absence of alternatives</span></br>
 				<a href="../speakers/keith-whyte/">Keith Whyte (Rhizomatica)</a>
 			</td>
 			<td>
-				Invisible Islands</br>
-				Locative New Media: Connecting the physical with the digital</br>
+				<span class="title">Invisible Islands</br>
+				Locative New Media: Connecting the physical with the digital</span></br>
 				<a href="../speakers/sebastien-pierre/">Sébastien Pierre</a>
 			</td>
 			<td></td>
 			<td class="workshop" rowspan="2">
-				I Think Therefore ICANN: An RPG About TLDs</br>
+				<span class="title">I Think Therefore ICANN: An RPG About TLDs</span></br>
 				<a href="../speakers/surya-mattu/">Surya Mattu</a> + <a href="../speakers/ingrid-burrington/">Ingrid Burrington</a>
 			</td>
-			<td class="workshop" rowspan="2">Erica Kermani + Miki Foster</td>
+			<td class="workshop" rowspan="2">
+				<span class="title">The Queer Red Phone: Designing Interfaces and Community Accountability Networks Through Mesh</span></br>
+				<a href="../speakers/erica-kermani/">Erica Kermani</a> + <a href="../speakers/miki-foster/">Miki Foster</a></td>
 		</tr>
 		<tr>
 			<td>11:30 - 12:00</td>
 			<td>
-				Trust Yourself More</br>
+				<span class="title">Trust Yourself More</span></br>
 				<a href="../speakers/shuli-hallak/">Shuli Hallak</a>
 			</td>
 			<td>
-				Ownership Incentives &amp; Network Evolution</br>
+				<span class="title">Ownership Incentives &amp; Network Evolution</span></br>
 				<a href="../speakers/jesse-tweedle/">Jesse Tweedle</a>
 			</td>
 			<td></td>
@@ -336,43 +344,43 @@
 		<tr>
 			<td>13:00 - 14:00</td>
 			<td>
-				Alternet</br>
+				<span class="title">Alternet</span></br>
 				<a href="../speakers/sarah-gold/">Sarah T. Gold</a>
 			</td>
 			<td>Lightning Sessions</td>
-			<td class="workshop" rowspan="6">
-				Bibliotecha Workshop</br>
+			<td class="workshop" rowspan="5">
+				<span class="title">Bibliotecha Workshop</span></br>
 				<a href="../speakers/andre-castro/">Andre Castro</a>, <a href="../speakers/lucia-dossin/">Lucia Dossin</a> + <a href="../speakers/michaela-lakova/">Michaela Lakova</a>
 			</td>
-			<td class="workshop" rowspan="6">
-				<a href="../speakers/josh-king/">Josh King</a></br>
-				Commotion Workshop
+			<td class="workshop" rowspan="5">
+				<span class="title">Commotion Workshop</span></br>
+				<a href="../speakers/josh-king/">Josh King</a>
 			</td>
-			<td class="workshop" rowspan="6">
-				Windfarms Workshop</br>
+			<td class="workshop" rowspan="5">
+				<span class="title">Windfarms Workshop</span></br>
 				<a href="../speakers/nathan-freitas/">Nathan Freitas</a>
 			</td>
 		</tr>
 		<tr>
 			<td>14:10 - 14:40</td>
 			<td>
-				Bringing Connectivity to Rural Areas in Bangladesh</br>
+				<span class="title">Bringing Connectivity to Rural Areas in Bangladesh</span></br>
 				<a href="../speakers/lutfor-rahman/">Dr. Lutfor Rahman</a>
 			</td>
 			<td>
-				The Pervasive Rhizome: Data Tracking Edition <strong>and</strong></br>
-				Playful Mesh: Site-Specific Game to Visualize Network</br>
+				<span class="title">The Pervasive Rhizome: Data Tracking Edition <strong>and</strong></br>
+				Playful Mesh: Site-Specific Game to Visualize Network</span></br>
 				<a href="../speakers/ansh-patel/">Ansh Patel</a>
 			</td>
 		</tr>
 		<tr>
 			<td>14:50 - 15:30</td>
 			<td>
-				In The Final Days Of The WWW</br>
+				<span class="title">In The Final Days Of The WWW</span></br>
 				<a href="../speakers/dennis-de-bel/">Dennis de Bel</a> + <a href="../speakers/roel-roscam-abbing/">Roel Roscam Abbing</a>
 			</td>
 			<td>
-				Decentralized Peer To Peer Social Networks</br>
+				<span class="title">Decentralized Peer To Peer Social Networks</span></br>
 				Oliver Fisher
 			</td>
 		</tr>
@@ -384,7 +392,7 @@
 		<tr>
 			<td>16:00 - 17:00</td>
 			<td>
-				Anti-Colonial Hacking</br>
+				<span class="title">Anti-Colonial Hacking</span></br>
 				<a href="../speakers/sophie-toupin/">Sophie Toupin</a>
 			</td>
 			<td>
@@ -394,18 +402,21 @@
 		<tr>
 			<td>17:10 - 17:30</td>
 			<td rowspan="2">
-				Stupid, Messy Networks</br>
+				<span class="title">Stupid, Messy Networks</span></br>
 				<a href="../speakers/jochen-maria-weber/">Jochen Maria Weber</a>
 			</td>
 			<td>
-				Be your own NSA: Regain IO control.<br/>
+				<span class="title">Be your own NSA: Regain IO control</span><br/>
 				<a href="../speakers/yifu-guo/">Yifu Guo</a>
 			</td>
+			<td></td>
+			<td></td>
+			<td></td>
 		</tr>
 		<tr>
 			<td>17:30 - 18:00</td>
 			<td>
-				Probe Kit</br>
+				<span class="title">Probe Kit</span></br>
 				<a href="../speakers/nick-briz/">Nick Briz</a> + <a href="../speakers/brannon-dorsey/">Brannon Dorsey</a>
 			</td>
 			<td></td>
@@ -415,11 +426,11 @@
 		<tr>
 			<td>18:10 - 18:30</td>
 			<td rowspan="2">
-				Crowd-Sourced Social Media Network Surveillance<br/>
+				<span class="title">Crowd-Sourced Social Media Network Surveillance</span><br/>
 				<a href="../speakers/derek-curry/">Derek Curry</a> + <a href="../speakers/jennifer-gradecki/">Jennifer Gradecki</a>
 			</td>
 			<td>
-				MTOS, Federated, Public Key Secured, Social Communications Infrastructure<br/>
+				<span class="title">MTOS, Federated, Public Key Secured, Social Communications Infrastructure</span><br/>
 				<a href="../speakers/andrew-davis/">Andrew Davis</a>
 			</td>
 			<td></td>
@@ -429,7 +440,7 @@
 		<tr>
 			<td>18:30 - 19:00</td>
 			<td>
-				Signal Strength + The Community Phonebooth</br>
+				<span class="title">Signal Strength + The Community Phonebooth</span></br>
 				<a href="../speakers/amelia-marzec/">Amelia Marzec</a>
 			</td>
 			<td></td>

+ 2 - 0
_site/speakers/index.html

@@ -100,6 +100,8 @@
 	<li><a href="ansh-patel">Ansh Patel</a></li>
 	<li><a href="amelia-marzec">Amelia Marzec</a></li>
 	<li>Dan Phiffer</li>
+	<li><a href="erica-kermani">Erica Kermani</a></li>
+	<li><a href="miki-foster">Miki Foster</a></li>
 	<li><a href="joshua-kopstein">Joshua Kopstein</a></li>
 	<li><a href="garry-ing">Garry Ing</a></li>
 	<li><a href="josh-king">Josh King</a></li>

+ 11 - 0
_site/speakers/josh-king/index.html

@@ -97,6 +97,17 @@ social justice. Josh is the Lead Technologist at New America's Open
 Technology Institute, has co-organized the International Summit for
 Community Wireless Networks, and has his roots in the tech development
 and organizing around the Indymedia movement. He lives in Washington, DC.</p>
+<hr />
+<h2>Presenting</h2>
+<h3>Workshop: Commotion Wireless</h3>
+<p><a href="https://commotionwireless.net/" target="_blank">Commotion</a> is a project that helps communities use cheap wireless hardware and open-source software to build their own network
+infrastructure. These networks can help spread cheap internet access, as
+well as provide a powerful alternative to traditional networks through
+providing local services, local ownership, and resilience. At this
+workshop, one of Commotion's developers will walk participants through
+the process of organizing, designing, and building their own networks.
+Additionally, we will talk about the technology behind community
+networks, and the rich history of such networks throughout the world.</p>
   </div>
 </div>
 

+ 4 - 0
assets/themes/bootstrap-3/css/style.css

@@ -403,6 +403,10 @@ header h1 {
   margin-bottom: 20px;
 }
 
+a .title {
+  color: #fff;
+}
+
 /* MISC */
 .clearfix:after {
   display: block;

+ 54 - 46
program/index.html

@@ -35,16 +35,22 @@ group: navigation
 		<tr>
 			<td>10:30 - 11:15</td>
 			<td>
-				‘This band is your band, this band is my band...’</br>
-				<a href="../speakers/rachel-odwyer">Rachel Dwyer</a>
+				<a href="../speakers/rachel-odwyer">
+					<span class="title">‘This band is your band, this band is my band...’</span></br>
+					Rachel Dwyer
+				</a>
 			</td>
 			<td>
-				NYC Mesh, a community owned Wi-Fi network</br>
-				<a href="../speakers/brian-hall">Brian Hall</a>, <a href="../speakers/julien-deswaef">Julien Deswaef</a>, <a href="../speakers/dan-grinkevich">Dan Grinkevich</a>
+				<a href="../speakers/brian-hall">
+					<span class="title">NYC Mesh, a community owned Wi-Fi network</span></br>
+					Brian Hall
+				</a>, <a href="../speakers/julien-deswaef">Julien Deswaef</a>, <a href="../speakers/dan-grinkevich">Dan Grinkevich</a>
 			</td>
 			<td class="workshop" rowspan="2">
-				Ways of Seeing: Visualizing Networks Workshop</br>
-				<a href="../speakers/dawn-walker">Dawn Walker</a>
+				<a href="../speakers/dawn-walker">
+					<span class="title">Ways of Seeing: Visualizing Networks Workshop</span></br>
+					Dawn Walker
+				</a>
 			</td>
 			<td></td>
 			<td></td>
@@ -52,11 +58,11 @@ group: navigation
 		<tr>
 			<td>11:30 - 12:00</td>
 			<td>
-				Eccentric WiFi: Networks with others</br>
+				<span class="title">Eccentric WiFi: Networks with others</span></br>
 				<a href="../speakers/tega-brain">Tega Brain</a>
 			</td>
 			<td>
-				Over the top networks, a history of building new systems on the wreckage of the old</br>
+				<span class="title">Over the top networks, a history of building new systems on the wreckage of the old</span></br>
 				<a href="../speakers/edward-vielmetti">Edward Vielmetti</a>
 			</td>
 			<td></td>
@@ -73,19 +79,19 @@ group: navigation
 		<tr>
 			<td>13:00 - 13:30</td>
 			<td>
-				SDR-101 : The Hitchhiker's Guide to the RF Spectrum</br>
+				<span class="title">SDR-101 : The Hitchhiker's Guide to the RF Spectrum</span></br>
 				<a href="../speakers/surya-mattu">Surya Mattu</a>
 			</td>
 			<td>
-				The Importance of Soft Infrastructure</br>
+				<span class="title">The Importance of Soft Infrastructure</span></br>
 				<a href="../speakers/chris-fussner">Chris Fussner</a> + <a href="../speakers/noah-emrich">Noah Emrich</a>
 			</td>
 			<td class="workshop" rowspan="6">
-				How was your day? Ambient Networks Workshop</br>
+				<span class="title">How was your day? Ambient Networks Workshop</span></br>
 				<a href="../speakers/carrie-kengle">Carrie Kengle</a> + <a href="../speakers/bruno-kruse">Bruno Kruse</a>
 			</td>
 			<td class="workshop" rowspan="6">
-				Packet Radio Networks Workshop</br>
+				<span class="title">Packet Radio Networks Workshop</span></br>
 				<a href="../speakers/dennis-de-bel">Dennis de Bel</a> + <a href="../speakers/roel-roscam-abbing">Roel Roscam Abbing</a>
 			</td>
 			<td></td>
@@ -93,11 +99,11 @@ group: navigation
 		<tr>
 			<td>13:40 - 14:40</td>
 			<td>
-				I Will Follow You Into the Dark[net]</br>
+				<span class="title">I Will Follow You Into the Dark[net]</span></br>
 				<a href="../speakers/david-huerta">David Huerta</a> + <a href="../speakers/caroline-sinders">Caroline Sinders</a> + <a href="../speakers/stephanie-hyland">Stephanie Hyland</a>
 			</td>
 			<td>
-				A History of the Future of Solarpunk Ham Radio Club</br>
+				<span class="title">A History of the Future of Solarpunk Ham Radio Club</span></br>
 				<a href="../speakers/adam-rothstein">Adam Rothstein</a> + <a href="../speakers/rob-ray">Rob Ray</a>
 			</td>
 			<td></td>
@@ -105,11 +111,11 @@ group: navigation
 		<tr>
 			<td>14:50 - 15:30</td>
 			<td>
-				Ghost Networks</br>
+				<span class="title">Ghost Networks</span></br>
 				<a href="../speakers/ingrid-burrington">Ingrid Burrington</a>
 			</td>
 			<td>
-				Appropriating Technologies for Protests of Futures</br>
+				<span class="title">Appropriating Technologies for Protests of Futures</span></br>
 				<a href="../speakers/pedro-oliveria">Pedro Oliveria</a>
 			</td>
 			<td></td>
@@ -123,15 +129,15 @@ group: navigation
 		<tr>
 			<td>16:00 - 16:30</td>
 			<td>
-				MAC as a Place and Landscape</br>
+				<span class="title">MAC as a Place and Landscape</span></br>
 				<a href="../speakers/garry-ing">Garry Ing</a>
 			</td>
 			<td>
-				Democracy Through Grassroot Local Networks</br>
+				<span class="title">Democracy Through Grassroot Local Networks</span></br>
 				<a href="../speakers/joe-chasinga">Joe Chasinga</a>
 			</td>
 			<td class="workshop" rowspan="5">
-				There Is No Cloud: Dumping Dropbox to Create a Personal Anti-Cloud For Cheap (Workshop)</br>
+				<span class="title">Workshop: There Is No Cloud: Dumping Dropbox to Create a Personal Anti-Cloud For Cheap</span></br>
 				<a href="../speakers/joshua-kopstein">Joshua Kopstein</a>
 			</td>
 		</tr>
@@ -139,18 +145,18 @@ group: navigation
 			<td>16:40 - 17:00</td>
 			<td>Dan Phiffer</td>
 			<td>
-				Public transportation GPS Tracking</br>
+				<span class="title">Public transportation GPS Tracking</span></br>
 				<a href="../speakers/epic-jefferson">Epic Jefferson</a>
 			</td>
 		</tr>
 		<tr>
 			<td>17:10 - 17:40</td>
 			<td rowspan="2">
-				GSM For Good</br>
+				<span class="title">GSM For Good</span></br>
 				<a href="../speakers/benedetta-piantella">Benedetta Piantella</a>
 			</td>
 			<td>
-				Bibliotecha</br>
+				<span class="title">Bibliotecha</span></br>
 				<a href="../speakers/andre-castro">Andre Castro</a>, <a href="../speakers/lucia-dossin">Lucia Dossin</a>
 			</td>
 			<td></td>
@@ -165,7 +171,7 @@ group: navigation
 		<tr>
 			<td>18:20 - 18:50</td>
 			<td>
-				Security &amp; Privacy in Mesh Networks</br>
+				<span class="title">Security &amp; Privacy in Mesh Networks</span></br>
 				<a href="../speakers/paige-peterson">Paige Peterson</a>
 			</td>
 			<td></td>
@@ -214,29 +220,31 @@ group: navigation
 		<tr>
 			<td>10:30 - 11:20</td>
 			<td>
-				On being the alternative in the absence of alternatives</br>
+				<span class="title">On being the alternative in the absence of alternatives</span></br>
 				<a href="../speakers/keith-whyte/">Keith Whyte (Rhizomatica)</a>
 			</td>
 			<td>
-				Invisible Islands</br>
-				Locative New Media: Connecting the physical with the digital</br>
+				<span class="title">Invisible Islands</br>
+				Locative New Media: Connecting the physical with the digital</span></br>
 				<a href="../speakers/sebastien-pierre/">Sébastien Pierre</a>
 			</td>
 			<td></td>
 			<td class="workshop" rowspan="2">
-				I Think Therefore ICANN: An RPG About TLDs</br>
+				<span class="title">I Think Therefore ICANN: An RPG About TLDs</span></br>
 				<a href="../speakers/surya-mattu/">Surya Mattu</a> + <a href="../speakers/ingrid-burrington/">Ingrid Burrington</a>
 			</td>
-			<td class="workshop" rowspan="2">Erica Kermani + Miki Foster</td>
+			<td class="workshop" rowspan="2">
+				<span class="title">The Queer Red Phone: Designing Interfaces and Community Accountability Networks Through Mesh</span></br>
+				<a href="../speakers/erica-kermani/">Erica Kermani</a> + <a href="../speakers/miki-foster/">Miki Foster</a></td>
 		</tr>
 		<tr>
 			<td>11:30 - 12:00</td>
 			<td>
-				Trust Yourself More</br>
+				<span class="title">Trust Yourself More</span></br>
 				<a href="../speakers/shuli-hallak/">Shuli Hallak</a>
 			</td>
 			<td>
-				Ownership Incentives &amp; Network Evolution</br>
+				<span class="title">Ownership Incentives &amp; Network Evolution</span></br>
 				<a href="../speakers/jesse-tweedle/">Jesse Tweedle</a>
 			</td>
 			<td></td>
@@ -252,43 +260,43 @@ group: navigation
 		<tr>
 			<td>13:00 - 14:00</td>
 			<td>
-				Alternet</br>
+				<span class="title">Alternet</span></br>
 				<a href="../speakers/sarah-gold/">Sarah T. Gold</a>
 			</td>
 			<td>Lightning Sessions</td>
 			<td class="workshop" rowspan="5">
-				Bibliotecha Workshop</br>
+				<span class="title">Bibliotecha Workshop</span></br>
 				<a href="../speakers/andre-castro/">Andre Castro</a>, <a href="../speakers/lucia-dossin/">Lucia Dossin</a> + <a href="../speakers/michaela-lakova/">Michaela Lakova</a>
 			</td>
 			<td class="workshop" rowspan="5">
-				Commotion Workshop</br>
+				<span class="title">Commotion Workshop</span></br>
 				<a href="../speakers/josh-king/">Josh King</a>
 			</td>
 			<td class="workshop" rowspan="5">
-				Windfarms Workshop</br>
+				<span class="title">Windfarms Workshop</span></br>
 				<a href="../speakers/nathan-freitas/">Nathan Freitas</a>
 			</td>
 		</tr>
 		<tr>
 			<td>14:10 - 14:40</td>
 			<td>
-				Bringing Connectivity to Rural Areas in Bangladesh</br>
+				<span class="title">Bringing Connectivity to Rural Areas in Bangladesh</span></br>
 				<a href="../speakers/lutfor-rahman/">Dr. Lutfor Rahman</a>
 			</td>
 			<td>
-				The Pervasive Rhizome: Data Tracking Edition <strong>and</strong></br>
-				Playful Mesh: Site-Specific Game to Visualize Network</br>
+				<span class="title">The Pervasive Rhizome: Data Tracking Edition <strong>and</strong></br>
+				Playful Mesh: Site-Specific Game to Visualize Network</span></br>
 				<a href="../speakers/ansh-patel/">Ansh Patel</a>
 			</td>
 		</tr>
 		<tr>
 			<td>14:50 - 15:30</td>
 			<td>
-				In The Final Days Of The WWW</br>
+				<span class="title">In The Final Days Of The WWW</span></br>
 				<a href="../speakers/dennis-de-bel/">Dennis de Bel</a> + <a href="../speakers/roel-roscam-abbing/">Roel Roscam Abbing</a>
 			</td>
 			<td>
-				Decentralized Peer To Peer Social Networks</br>
+				<span class="title">Decentralized Peer To Peer Social Networks</span></br>
 				Oliver Fisher
 			</td>
 		</tr>
@@ -300,7 +308,7 @@ group: navigation
 		<tr>
 			<td>16:00 - 17:00</td>
 			<td>
-				Anti-Colonial Hacking</br>
+				<span class="title">Anti-Colonial Hacking</span></br>
 				<a href="../speakers/sophie-toupin/">Sophie Toupin</a>
 			</td>
 			<td>
@@ -310,11 +318,11 @@ group: navigation
 		<tr>
 			<td>17:10 - 17:30</td>
 			<td rowspan="2">
-				Stupid, Messy Networks</br>
+				<span class="title">Stupid, Messy Networks</span></br>
 				<a href="../speakers/jochen-maria-weber/">Jochen Maria Weber</a>
 			</td>
 			<td>
-				Be your own NSA: Regain IO control.<br/>
+				<span class="title">Be your own NSA: Regain IO control</span><br/>
 				<a href="../speakers/yifu-guo/">Yifu Guo</a>
 			</td>
 			<td></td>
@@ -324,7 +332,7 @@ group: navigation
 		<tr>
 			<td>17:30 - 18:00</td>
 			<td>
-				Probe Kit</br>
+				<span class="title">Probe Kit</span></br>
 				<a href="../speakers/nick-briz/">Nick Briz</a> + <a href="../speakers/brannon-dorsey/">Brannon Dorsey</a>
 			</td>
 			<td></td>
@@ -334,11 +342,11 @@ group: navigation
 		<tr>
 			<td>18:10 - 18:30</td>
 			<td rowspan="2">
-				Crowd-Sourced Social Media Network Surveillance<br/>
+				<span class="title">Crowd-Sourced Social Media Network Surveillance</span><br/>
 				<a href="../speakers/derek-curry/">Derek Curry</a> + <a href="../speakers/jennifer-gradecki/">Jennifer Gradecki</a>
 			</td>
 			<td>
-				MTOS, Federated, Public Key Secured, Social Communications Infrastructure<br/>
+				<span class="title">MTOS, Federated, Public Key Secured, Social Communications Infrastructure</span><br/>
 				<a href="../speakers/andrew-davis/">Andrew Davis</a>
 			</td>
 			<td></td>
@@ -348,7 +356,7 @@ group: navigation
 		<tr>
 			<td>18:30 - 19:00</td>
 			<td>
-				Signal Strength + The Community Phonebooth</br>
+				<span class="title">Signal Strength + The Community Phonebooth</span></br>
 				<a href="../speakers/amelia-marzec/">Amelia Marzec</a>
 			</td>
 			<td></td>

BIN
speakers/.DS_Store


+ 2 - 0
speakers/index.html

@@ -16,6 +16,8 @@ group: navigation
 	<li><a href="ansh-patel">Ansh Patel</a></li>
 	<li><a href="amelia-marzec">Amelia Marzec</a></li>
 	<li>Dan Phiffer</li>
+	<li><a href="erica-kermani">Erica Kermani</a></li>
+	<li><a href="miki-foster">Miki Foster</a></li>
 	<li><a href="joshua-kopstein">Joshua Kopstein</a></li>
 	<li><a href="garry-ing">Garry Ing</a></li>
 	<li><a href="josh-king">Josh King</a></li>

+ 1 - 2
speakers/josh-king/index.html

@@ -16,8 +16,7 @@ and organizing around the Indymedia movement. He lives in Washington, DC.</p>
 <hr />
 <h2>Presenting</h2>
 <h3>Workshop: Commotion Wireless</h3>
-<p>Commotion is a project that helps communities use cheap wireless
-hardware and open-source software to build their own network
+<p><a href="https://commotionwireless.net/" target="_blank">Commotion</a> is a project that helps communities use cheap wireless hardware and open-source software to build their own network
 infrastructure. These networks can help spread cheap internet access, as
 well as provide a powerful alternative to traditional networks through
 providing local services, local ownership, and resilience. At this