Merge pull request #8 from miho10/feature/test

pullrequest1
Update textA.txt
Merge branch 'master' into feature/test

Conflicts:
	textA.txt