socket testing WIP
Merge branch 'master' into jseip1679
Merge branch 'master' of https://github.com/bchu/nodetron into brian
Moved order of scripts - peerSetup is last
Socket IO incorporation
Merge branch 'master' of https://github.com/bchu/nodetron into brian