test fix
conflict fix
conflict fix
Merge branch 'EmilRojewski'
add links to tournaments names
changes