Merge branch 'develop' into 'master'

Update hello.txt in new branch

make a new branch and merge call

See merge request !1

hello.txt

 hello git
 edited in web
 edited in local rep
+edited in develop branch
\ No newline at end of file