Piece of fucking shit!

Signed-off-by: chthonic7 <fooliot@gmail.com>
Merge remote-tracking branch 'origin/master'

Conflicts:
	bin/TournamentRunner.class
	bin/WDPlayer.class

Signed-off-by: chthonic7 <fooliot@gmail.com>