Merge branch 'techjeffharris-master'
add example usage for Socket.io >= 1.0
3.1.0
Merge pull request #1 from jfromaniello/master

Pull from upstream