Merge branch 'master' of /home/clouway/workspaces/idea/homework.clouw-y with conflicts.
push ccccc to master