Delete NCOC_*
Merge branches 'univ' and 'univ' of github.com:mathink/Cat_on_Coq into univ

Conflicts:
	Makefile