Merge branch 'working'
authorJim <jim.pryor@nyu.edu>
Wed, 29 Apr 2015 14:51:17 +0000 (10:51 -0400)
committerJim <jim.pryor@nyu.edu>
Wed, 29 Apr 2015 14:51:17 +0000 (10:51 -0400)
* working:
  refunct zippers code


Trivial merge