Merge branch 'master' of C:\Users\MarcinS\sources\Semantyczne repozytorium wideo\video_repository with conflicts.
Edited .gitignore