fixed git error
Merge branch 'master' of https://github.com/HoTT/book

Conflicts:
	preliminaries.tex