Addes ws into socket.io server, now forwards data from browser
Fixed merge conflicts with Owen
Fixed conflicts...again