types/Unit
Merge remote branch 'upstream/master' into unit
Merge remote branch 'upstream/master'
added a few lemmas.  "cancel" now means "unwhisker".
Merge branch 'cancel' into sigma
fix a couple things in the 'done' tactic
Merge branch 'cancel' into sigma
types/Sigma
Working on HSet
Merge branch 'sigma' of https://github.com/mikeshulman/HoTT

Conflicts:
	theories/HSet.v