Non-git merge so that Exercise 2.1 works
Small typo