Merge branch 'master' of C:\Users\Shtefan\Documents\GitHub\Mzhvyachni with conflicts.