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

Update