change readme.txt for branch dev
add new feature on branch dev
master commit
merge finished
haha add to readme
modify on master
merge fo dev
add~~~ one dev
add Hello.java
modify Hello.java
modidy Hello.java again
Merge branch 'dev'
Fix bug
add config
merge a conf to master