types/Empty.v is done
Merge branch 'master' of https://github.com/HoTT/HoTT
Working on HSet
Merge branch 'sigma' of https://github.com/mikeshulman/HoTT

Conflicts:
	theories/HSet.v
Merge branch 'prod' of https://github.com/mikeshulman/HoTT
Merge branch 'upstream'
Move "Empty" and "not" and "~" from Empty.v to Overture.v because "Ltac done"
uses them.
Merge branch 'pull-request-1' of https://github.com/DanGrayson/HoTT into upstream
Almost finished porting HSet
Merge branch 'master' of github.com:HoTT/HoTT
Fixing HSet, adapting to the new ~
Merge branch 'upstream'