Editing formal.tex.
Merge branch 'master' of github.com:HoTT/book

Conflicts:
	formal.tex