cenas
Merge branch 'master' of https://github.com/pedro93/COMP

Conflicts:
	JavaCC Proj/src/CNFParser.jjt