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

Fixed somethings