Merge branch 'develop' into 'master'

Update hello.txt in develop branch

Write a comment or drag your files here...

See merge request !1

hello.txt

 hello
 modify in PC
 edit in Web Service 
+modify in branch "develop"
\ No newline at end of file