non important corrections
integrando regexp con testcases
Merge branch 'master' of https://github.com/MarcoLotto/unitTestTddFiuba

Conflicts:
	src/main/java/criteriaFiltering/Criteria.java