basic websockets and faye code added. no functionality
tring to fix merge conflict