Revert "Revert "Merge branch 'master' of https://github.com/kytarovy-zpevnik/backend""

This reverts commit 6c315e418824b48c6791f285b02127437421a44f.