test branch add message.
add chongtu message.
master branch add content
conflict fixed
modify readme.txt
fix bug
merge bug
stash update.
master update.