2-out-of-3 and 2-out-of-6
Merge branch 'master' of github.com:HoTT/book