clear master
mergeed
add server.js
some changes