Fix isCNF
Merge remote-tracking branch 'jose/jose'

Conflicts:
	logic.hs