Hello world
Remove hello world
Merge 'test' into 'master' with github-merge