add one line in readme in branch1
add one line in master branch
fix conflict when merge
Merge branch 'master' of https://github.com/Fa-long/bqfs-tools

Conflicts:
	README.md