added js
Merge branch 'master' into sandbox
add server.js