Added HelloWorld
Updated README.md
Fixed a merge conflict