dev branch firt commit
feature1 first modify
master commit
feature1 commit
master commit
after fix conflict
xx
fix bug 102
dev branch commit
master fix conflig
master commit readme
fix bug 103
dev work finished
Merge branch 'dev'