hello world modified
Merge pull request #12 from crystalist/master

another one
Merge branch 'newhello'
fixed