Minor changes
Resolving conflicts

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

Conflicts:
	hlevels.tex