To resolve conflicts
Merge branch 'master' of github.com:pythonProject/films
To Manya could add some movie