branch test
add simple
& simple
conflict fixed
add no-ff
merge with no-ff
add hello.txt
add hello.txt
add hello.txt
update reademe.txt, add git stash
update hello.txt, add 10.23
Merge branch 'dev'