worked on tournament js
merge resolution
Merge branch 'darrell'