Fixing HProp
Merge branch 'pull-request-2' of https://github.com/DanGrayson/HoTT

Fixing Conflicts:
	theories/Equivalences.v
	theories/HProp.v
	theories/Overture.v
Merge branch 'master' of https://github.com/spitters/HoTT into upstream

Conflicts:
	theories/EquivalenceVarieties.v
	theories/Equivalences.v