Exercise 3
Merge remote-tracking branch 'refs/remotes/origin/master'

Conflicts:
	chapter 2/section2-2.md