working on basics-computational
fix \htpy
Merge branch 'master' of github.com:HoTT/book

Conflicts:
	basics.tex