0 -> 000
Merge branch 'master' of https://github.com/kyohei0806/Test

Conflicts:
	A.txt