Fixed match predicate. Fixed Update and Match Warnings.
Fixed Conflict

Conflicts:
	project/match.pl