Added hello file
Fixed merge