Merge branch 'master' into working
authorJim <jim.pryor@nyu.edu>
Thu, 19 Mar 2015 03:36:16 +0000 (23:36 -0400)
committerJim <jim.pryor@nyu.edu>
Thu, 19 Mar 2015 03:36:16 +0000 (23:36 -0400)
commitb15a6b392f7989734f899fc9efcb211f95d2f416
treeaa19e4b22b5e67afd4f79560f218fe6b1758c7cc
parentf0dac567a643fae66a6cba5b7e85d785c347f2bc
parentd198ef88b87d24fb20d2153a5c49be6d1285668e
Merge branch 'master' into working

* master:
  rename topics/week7__95__combinatory__95__evaluator.mdwn to topics/week7_combinatory_evaluator.mdwn
  light editing, rename functions for clarity
  rename topics/week7_eval_combinatory.mdwn to topics/week7__95__combinatory__95__evaluator.mdwn
  rename eval_combinatory
  post combinatory evaluator
  post eval_combinatory
  rename topics/week7_eval_cl.mdwn to topics/week7_eval_combinatory.mdwn
  add Plexy and some stubs/reorganization
  link to Plexy
  rename topics/_week6_plexy.mdwn to topics/week6_plexy.mdwn
  update