chp5
Merge remote-tracking branch 'origin/master'

Conflicts:
	source/chp5.rst
fix