prepare for competition
Merge branch 'file-hash' of github.com:bschmoker/matchmaker into file-hash

Conflicts:
	in.xml