made a change
add hello function to main.js
no message
resolved conflict in merging test and mater branches