Commit last changes before merging in master
Merge branches 'master' and 'martina'
Merge branch 'master' of https://github.com/viktorstaikov/world-cup-problem