From: Jim <jim.pryor@nyu.edu>
Date: Sat, 21 Feb 2015 14:15:57 +0000 (-0500)
Subject: Merge branch 'working'
X-Git-Url: http://lambda.jimpryor.net/git/gitweb.cgi?p=lambda.git;a=commitdiff_plain;h=6694165ac4d6edab602b3ad3651d0a5931b36a0e

Merge branch 'working'

* working:
  replace tattoo image
---

6694165ac4d6edab602b3ad3651d0a5931b36a0e