add merge.js
add merge1.js
add merge and merge1.js
add article
Merge branch 'new' into ramesh