story
Merge branch 'master' of https://github.com/konturschool/01-git-task

Conflicts:
	README.md
Merge branch 'master' of https://github.com/konturschool/01-git-task
Merge branch 'master' of https://github.com/konturschool/01-git-task