added some socket functionality
Merge branch 'master' of https://github.com/jsl15/viceralColorProject
needed to merge