updated match

Conflicts:
	Match.java

update stuff