finished solutions to exercises, fixed typos
Merge branch 'master' of github.com:aaschwanden/mccarthy-summerschool

Conflicts:
	exercises.py