changed the helloworld file. Fixes issue #1
fixed merge issues
Merge pull request #3 from TomyRO/test_branch

changed the helloworld file. Fixes issue #1