Merge branch 'working'
authorJim <jim.pryor@nyu.edu>
Sat, 21 Feb 2015 14:15:57 +0000 (09:15 -0500)
committerJim <jim.pryor@nyu.edu>
Sat, 21 Feb 2015 14:15:57 +0000 (09:15 -0500)
commit6694165ac4d6edab602b3ad3651d0a5931b36a0e
treebaceffb84a3ef0742d35c8adeba34b797e559a3d
parent4d707dbfe2f8c47264a746063a3f9f5b05cdc7a4
parent12b94057358619fd5ae7a48f685fedba8ce4d082
Merge branch 'working'

* working:
  replace tattoo image
topics/week4_fixed_point_combinators.mdwn