к
Merge branch 'master' of https://github.com/annabyelkina/test
Merge branch 'master' of https://github.com/annabyelkina/test

Conflicts:
	asciidoc from oreily/appc.asciidoc