Merge pull request #1 from MattAitchison/socketio

Merge Socket.IO