moved README to README.txt
Add Kristina's better proof that IsEquiv is an hprop.
Merge branch 'upstream' into eqvar
naming and arguments for contr_equiv and trunc_equiv
Merge branch 'truncequiv' into eqvar

Conflicts:
	theories/EquivalenceVarieties.v