Inductive type families defined, no recursion yet.
Merge branch 'master' of https://github.com/siddhartha-gadgil/ProvingGround

Conflicts:
	src/main/scala/HoTT.scala