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

Fixed stuff