changed hello.js
merge completed