Merge pull request #84 from glenwks/master

Updates to manage tournament
Merge remote-tracking branch 'upstream2/master'