wip
update file #6
Merge branch 'issues/2'
Merge branch 'master' of https://github.com/nakair/doc

Conflicts:
	a.txt