Added code to chapter 3
Merge remote-tracking branch 'kakadu/master'

Conflicts:
	chapter03.tex