bug fixed
merge fixes branch
modify c.txt in master branch
modify d.txt in b3 branch