Added override to finish tournament
Fixed some charting issues
Merge remote-tracking branch 'origin/master'