From 063ae293fa4a4629fc81ea0200c44a4cdb7ef5c8 Mon Sep 17 00:00:00 2001
From: Ben Adida <ben@adida.net>
Date: Sun, 19 Jun 2011 12:50:24 -0700
Subject: [PATCH] merged in Emily Stark's SJCL integration, tweaked a bit

---
 CONTRIBUTORS.txt | 1 +
 heliosbooth      | 2 +-
 2 files changed, 2 insertions(+), 1 deletion(-)

diff --git a/CONTRIBUTORS.txt b/CONTRIBUTORS.txt
index 94805d56a..b02430b30 100644
--- a/CONTRIBUTORS.txt
+++ b/CONTRIBUTORS.txt
@@ -5,3 +5,4 @@ Significant contributors:
 - Ben Adida
 - Olivier Pereira
 - Olivier de Marneffe
+- Emily Stark, Mike Hamburg, Tom Wu, and Dan Boneh for SJCL and integration of javascript crypto.
diff --git a/heliosbooth b/heliosbooth
index 32c18e661..fb6320e42 160000
--- a/heliosbooth
+++ b/heliosbooth
@@ -1 +1 @@
-Subproject commit 32c18e661342e5300cd2ded08d10bff03728adea
+Subproject commit fb6320e423ebcf3959e13f11f85e8f35346b3c5d