reference hprop choice resolution
Merge branch 'master' of github.com:HoTT/book