Merge branch 'master' of C:\Users\Vladislav\IdeaProjects\Progmeistars with conflicts.