add b.txt
merge dev to master