change readme
change README.md in master
resolve conflit
test
modify dev
merge from dev with no-ff
resolve issue-101
merge bug fix 101