done issue #17
Merge branch 'master' of https://github.com/denki/openttt

Conflicts:
	src/database/tournamentParts/Tournament.java