a
Merge branch 'stacy-lambda-edits'

Merging most recent version of lambda-defs.txt before working on new edits.
Resolving a previous conflict.