modify readme -+
fixbug 101
merged bug fix 101 to dev
add master dev
dev modify file2
master modify file2