added js file
added new.js file
alert html
Merge branch 'master' into testing