Adding Tournaments
Merge branch 'master' into feature-tournaments
Basic tournament implementation