From: Jim <jim.pryor@nyu.edu>
Date: Thu, 19 Mar 2015 15:38:32 +0000 (-0400)
Subject: Merge branch 'working'
X-Git-Url: http://lambda.jimpryor.net/git/gitweb.cgi?p=lambda.git;a=commitdiff_plain;h=66440f9d835c4c1239959776cf1aba72486ae0e8;ds=sidebyside

Merge branch 'working'

* working:
  more local.css updates
  update local.css

Conflicts:
	local.css
---

66440f9d835c4c1239959776cf1aba72486ae0e8