commit to merge
Merge branch 'chap5' into chap6

Conflicts:
	evaluator.py
	testAcceptance.py
	testEvaluator.py
finish section 6.1
finish section 6.2