merging
Merge branch 'master' of https://github.com/HoTT/book
working on prelim
Merge branch 'master' of https://github.com/HoTT/book