NACHALO SKAZKI
Merge branch 'master' of https://github.com/savelieva/hello

Conflicts:
	Сказка.txt
merging...
Merge branch 'master' of https://github.com/savelieva/hello

Conflicts:
	Сказка.txt