добавлены комментарии
merge origin/master into local master
merge origin/master into local master