chapter 2: changes by amy and florian
Merge remote-tracking branch 'origin/master'

Conflicts:
	docs/02_the_basics.md