Changes to Chapter 1 from meeting on 19 Feb
Merge branch 'master' of github.com:HoTT/book

Conflicts:
	preliminaries-txa.tex