Merge pull request #90 from glenwks/master

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