ddd
Merge branch 'master' of github.com:ryshinoz/git_sample

Conflicts:
	b.txt