From: Benjamin Mako Hill <mako@atdot.cc>
Date: Wed, 22 Jun 2016 00:55:07 +0000 (-0700)
Subject: merge in branch with lucy's changes
X-Git-Url: https://projects.mako.cc/source/leastsquares-website/commitdiff_plain/843c342e4602df67207584f78e3b914db4c2473d

merge in branch with lucy's changes
---

843c342e4602df67207584f78e3b914db4c2473d