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

update