update of book (shorter)
Merge remote-tracking branch 'upstream/master'

Conflicts:
	book-cambridge.Rmd