working on semantics
Merge branch 'master' of github.com:mikeshulman/hott-categories

Conflicts:
	hottcats.bib
groupoid semantics