modified readme.txt
add content picture
add picture2
resolve the conflict
add hello world
merge with no-ff
add hello world again
Merge branch 'dev'