Eval null triplets
Merge branch 'master' into Amos/triple-evaluation

Conflicts:
	project-team02/src/main/java/team2/Evaluator.java
Merge branch 'Amos/triple-evaluation'