change 3
Merge branch 'ch3'

Conflicts:
	README.md