dddd
Merge branch 'master' into task_2

Conflicts:
	first_file.txt
Merge pull request #2 from o-l-o/task_2

pull request with conflict