Merge branch 'feature/player'
volebni program
Merge branch 'master' into feature/player