Merge branch 'master' into working
authorJim <jim.pryor@nyu.edu>
Sat, 7 Feb 2015 19:49:32 +0000 (14:49 -0500)
committerJim <jim.pryor@nyu.edu>
Sat, 7 Feb 2015 19:49:32 +0000 (14:49 -0500)
commit9201649f036db0e397214de35bddc445cc0d49f2
tree414a06a60a0d7c80beb34f6b1940cf849861256b
parent32c4351cee928bc0153811e2786aa93056ff76af
parent5a066aa10dea3befa000fa938b12e41a5df3eb35
Merge branch 'master' into working

* master:
  add _lambda_encodings
  tweak
  add comment
  refine notes
  refine notes
  tweak link
  tweak

Conflicts:
topics/_lambda_encodings.mdwn