Finished chapter 1 discussion questions
Added definition for activation record
Resolved conflict
Merge branch 'patrick-mt'