Changes
Merge remote-tracking branch 'origin/master'

Conflicts:
	chapter9_2/chapter9_2.layout
	chapter9_4/chapter9_4.layout