Merge branch 'working'
authorJim <jim.pryor@nyu.edu>
Thu, 12 Feb 2015 16:49:37 +0000 (11:49 -0500)
committerJim <jim.pryor@nyu.edu>
Thu, 12 Feb 2015 16:49:37 +0000 (11:49 -0500)
commit691872ef87b1c41fb2b53fce867ce58732466c6d
treef7e561c6e27e455b29b42b6579702a61a309ddd7
parentd765cd3f1ae243cedf9ae80fcbf9f1051ff72c52
parentd99aa0c25495644522b9214dcb7b6e18e553586b
Merge branch 'working'

* working:
  tweak combinatory