added terms to chapter 2
Merge branch 'terms_revamp'
Merge pull request #34 from rackeric/master

adding labs to op ch5
added terms to chapter 2
renamed op ch5 to ch6 and moved labs around