Собрал статьи в master и исправил конфликты#880

calciumcode119 wants to merge 12 commits into

dvmn-tasks:masterdvmn-tasks/python-articles:masterfrom

calciumcode119:mastercalciumcode119/python-articles:masterCopy head branch name to clipboard