Update server.js
Update client.js
Merge pull request #124 from YOURsammich/master

update